X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstring.c;h=cebce12d9df897e9d7303058987c85af29ea58f0;hp=0fdd81e33266b52b9b80a91c3dba72f41223edb0;hb=9ffd39fc9c39e409991c1d3f800970cf58060dbb;hpb=3122e6f075647374e7a98ae9501d100de8d004a9

diff --git a/types/string.c b/types/string.c
index 0fdd81e3..cebce12d 100644
--- a/types/string.c
+++ b/types/string.c
@@ -16,6 +16,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/compiler.h>
@@ -68,7 +76,7 @@ struct definition *
 	int ret;
 
 	string = g_new(struct definition_string, 1);
-	declaration_ref(&string_declaration->p);
+	bt_declaration_ref(&string_declaration->p);
 	string->p.declaration = declaration;
 	string->declaration = string_declaration;
 	string->p.ref = 1;
@@ -96,12 +104,23 @@ void _string_definition_free(struct definition *definition)
 	struct definition_string *string =
 		container_of(definition, struct definition_string, p);
 
-	declaration_unref(string->p.declaration);
+	bt_declaration_unref(string->p.declaration);
 	g_free(string->value);
 	g_free(string);
 }
 
-char *get_string(struct definition *field)
+enum ctf_string_encoding get_string_encoding(const struct definition *field)
+{
+	struct definition_string *string_definition;
+	const struct declaration_string *string_declaration;
+
+	string_definition = container_of(field, struct definition_string, p);
+	string_declaration = string_definition->declaration;
+
+	return string_declaration->encoding;
+}
+
+char *get_string(const struct definition *field)
 {
 	struct definition_string *string_definition =
 		container_of(field, struct definition_string, p);