X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fenum.c;h=8a2463bb7db54cc300d7b7dceb7d6dc8957d88b7;hp=b973d494b195dcd67d65931979b3d28dc06996a7;hb=1cf393f63db4dce618515749d5549564d1313ee4;hpb=6743f229982176bfc2bdd2b3ab5c75ca62f45b35

diff --git a/formats/ctf-text/types/enum.c b/formats/ctf-text/types/enum.c
index b973d494..8a2463bb 100644
--- a/formats/ctf-text/types/enum.c
+++ b/formats/ctf-text/types/enum.c
@@ -16,13 +16,21 @@
  *
  * 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 <stdint.h>
 
-int ctf_text_enum_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_enum_write(struct bt_stream_pos *ppos, struct definition *definition)
 {
 	struct definition_enum *enum_definition =
 		container_of(definition, struct definition_enum, p);
@@ -30,7 +38,7 @@ int ctf_text_enum_write(struct stream_pos *ppos, struct definition *definition)
 		enum_definition->integer;
 	struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
 	GArray *qs;
-	int i, ret;
+	int ret;
 	int field_nr_saved;
 
 	if (!print_field(definition))
@@ -53,6 +61,8 @@ int ctf_text_enum_write(struct stream_pos *ppos, struct definition *definition)
 	qs = enum_definition->value;
 
 	if (qs) {
+		int i;
+
 		for (i = 0; i < qs->len; i++) {
 			GQuark q = g_array_index(qs, GQuark, i);
 			const char *str = g_quark_to_string(q);