X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fstring.c;h=df7f5f7d583ebcfd53c23d1b4eba42407982491f;hb=8099326b3438eb003bf3f9849ad1b3cd1f0d618c;hp=82bc361f2b96931cbe1f79be93a777f5b0940fd8;hpb=01c76b246be85b5d9c8e99813950fb194c9f714f;p=babeltrace.git

diff --git a/formats/ctf-text/types/string.c b/formats/ctf-text/types/string.c
index 82bc361f..df7f5f7d 100644
--- a/formats/ctf-text/types/string.c
+++ b/formats/ctf-text/types/string.c
@@ -16,15 +16,23 @@
  *
  * 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>
 #include <stdio.h>
-#include <limits.h>		/* C99 limits */
+#include <babeltrace/compat/limits.h>		/* C99 limits */
 #include <string.h>
 
-int ctf_text_string_write(struct stream_pos *ppos,
-			  struct definition *definition)
+int ctf_text_string_write(struct bt_stream_pos *ppos,
+			  struct bt_definition *definition)
 {
 	struct definition_string *string_definition =
 		container_of(definition, struct definition_string, p);
@@ -43,7 +51,7 @@ int ctf_text_string_write(struct stream_pos *ppos,
 	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, "\"%s\"", string_definition->value);
 	return 0;