namespace the scope_path functions

[babeltrace.git] / types / types.c

diff --git a/types/types.c b/types/types.c
index f74e730f3df71e2531b27b54bff4dc1e45a2db7a..9c5cfca3a3941be044abf68e4c4d90a35d560945 100644 (file)
--- a/types/types.c
+++ b/types/types.c
@@ -18,6 +18,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/format.h>
@@ -117,10 +125,10 @@ static int compare_paths(GArray *a, GArray *b, int len)
 
 static int is_path_child_of(GArray *path, GArray *maybe_parent)
 {
-       int i, ret;
+       int ret;
 
        if (babeltrace_debug) {
-               int need_dot = 0;
+               int i, need_dot = 0;
 
                printf_debug("Is path \"");
                for (i = 0; i < path->len; need_dot = 1, i++)
@@ -497,7 +505,6 @@ GQuark new_definition_path(struct definition_scope *parent_scope,
        GQuark path;
        GString *str;
        gchar *c_str;
-       int i;
        int need_dot = 0;
 
        str = g_string_new("");
@@ -505,6 +512,8 @@ GQuark new_definition_path(struct definition_scope *parent_scope,
                g_string_append(str, root_name);
                need_dot = 1;
        } else if (parent_scope) {
+               int i;
+
                for (i = 0; i < parent_scope->scope_path->len; i++) {
                        GQuark q = g_array_index(parent_scope->scope_path,
                                                 GQuark, i);
@@ -538,7 +547,7 @@ struct definition_scope *
 
        if (root_name) {
                scope = _new_definition_scope(parent_scope, 0);
-               append_scope_path(root_name, scope->scope_path);
+               bt_append_scope_path(root_name, scope->scope_path);
        } else {
                int scope_path_len = 1;
 
@@ -565,7 +574,7 @@ struct definition_scope *
 /*
  * in: path (dot separated), out: q (GArray of GQuark)
  */
-void append_scope_path(const char *path, GArray *q)
+void bt_append_scope_path(const char *path, GArray *q)
 {
        const char *ptrbegin, *ptrend = path;
        GQuark quark;
@@ -633,7 +642,7 @@ struct definition_integer *lookup_integer(const struct definition *definition,
        return lookup_integer;
 }
 
-struct definition_enum *lookup_enum(const struct definition *definition,
+struct definition_enum *bt_lookup_enum(const struct definition *definition,
                                    const char *field_name,
                                    int signedness)
 {