namespace the declaration functions

[babeltrace.git] / types / string.c

diff --git a/types/string.c b/types/string.c
index 9eaa9df800e25219e6d817e98c57daa2b94f4565..255388f0dcb7ab5ea433384c89433d68edc4cf0f 100644 (file)
--- a/types/string.c
+++ b/types/string.c
@@ -16,11 +16,20 @@
  *
  * 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>
 #include <babeltrace/align.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 
 static
 struct definition *_string_definition_new(struct declaration *declaration,
@@ -39,7 +48,7 @@ void _string_declaration_free(struct declaration *declaration)
 }
 
 struct declaration_string *
-       string_declaration_new(enum ctf_string_encoding encoding)
+       bt_string_declaration_new(enum ctf_string_encoding encoding)
 {
        struct declaration_string *string_declaration;
 
@@ -67,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;
@@ -95,7 +104,28 @@ 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);
 }
+
+enum ctf_string_encoding bt_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 *bt_get_string(const struct definition *field)
+{
+       struct definition_string *string_definition =
+               container_of(field, struct definition_string, p);
+
+       assert(string_definition->value != NULL);
+
+       return string_definition->value;
+}