*
* Strings read/write functions.
*
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
#include <limits.h> /* C99 limits */
#include <string.h>
-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 = ",
+ rem_(g_quark_to_string(definition->name)));
+
+ fprintf(pos->fp, "\"%s\"", string_definition->value);
+ return 0;
}