namespace the variant functions

[babeltrace.git] / formats / ctf-text / types / variant.c

diff --git a/formats/ctf-text/types/variant.c b/formats/ctf-text/types/variant.c
index 871b8d58a8435af3badad90cface116bbae73a93..e7e50ace953ca03d16bba960c206589bf5c6ff82 100644 (file)
--- a/formats/ctf-text/types/variant.c
+++ b/formats/ctf-text/types/variant.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/ctf-text/types.h>
@@ -37,14 +45,14 @@ int ctf_text_variant_write(struct stream_pos *ppos, struct definition *definitio
                        fprintf(pos->fp, " ");
                        if (pos->print_names)
                                fprintf(pos->fp, "%s = ",
-                                       g_quark_to_string(definition->name));
+                                       rem_(g_quark_to_string(definition->name)));
                        fprintf(pos->fp, "{");
                }
                pos->depth++;
        }
        field_nr_saved = pos->field_nr;
        pos->field_nr = 0;
-       ret = variant_rw(ppos, definition);
+       ret = bt_variant_rw(ppos, definition);
        if (!pos->dummy) {
                pos->depth--;
                if (pos->depth >= 0) {