X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fstring.c;h=82bc361f2b96931cbe1f79be93a777f5b0940fd8;hb=5c551b40d8697add8fde696de8bce7c2d43993ea;hp=22103ce80b742522bc779582542a0cd0dc0e0e77;hpb=1ae19169d9cb823765444d22cdb05cd2ed3f162f;p=babeltrace.git diff --git a/formats/ctf-text/types/string.c b/formats/ctf-text/types/string.c index 22103ce8..82bc361f 100644 --- a/formats/ctf-text/types/string.c +++ b/formats/ctf-text/types/string.c @@ -3,7 +3,9 @@ * * Strings read/write functions. * - * Copyright 2010 - Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,16 +23,28 @@ #include /* C99 limits */ #include -void ctf_text_string_write(struct stream_pos *ppos, - struct definition *definition) +int ctf_text_string_write(struct stream_pos *ppos, + struct definition *definition) { struct definition_string *string_definition = container_of(definition, struct definition_string, p); struct ctf_text_stream_pos *pos = ctf_text_pos(ppos); assert(string_definition->value != NULL); + + if (!print_field(definition)) + return 0; + if (pos->dummy) - return; - print_pos_tabs(pos); - fprintf(pos->fp, "%s\n", string_definition->value); + return 0; + + if (pos->field_nr++ != 0) + fprintf(pos->fp, ","); + fprintf(pos->fp, " "); + if (pos->print_names) + fprintf(pos->fp, "%s = ", + g_quark_to_string(definition->name)); + + fprintf(pos->fp, "\"%s\"", string_definition->value); + return 0; }