Fix a number of warnings.

svn path=/trunk/yasm/; revision=2133

diff --git a/libyasm/bc-data.c b/libyasm/bc-data.c
index bdbf7b6b08d8ee7bbdb3a46307a7f0235b0a8184..3191958b323a30df934c06b3a2ea2de229e4cea8 100644 (file)
--- a/libyasm/bc-data.c
+++ b/libyasm/bc-data.c
@@ -166,7 +166,7 @@ bc_data_calc_len(yasm_bytecode *bc, yasm_bc_add_span_func add_span,
     bytecode_data *bc_data = (bytecode_data *)bc->contents;
     yasm_dataval *dv;
     yasm_intnum *intn;
-    int len;
+    unsigned long len = 0;
     unsigned long multiple;
 
     /* Count up element sizes, rounding up string length. */

diff --git a/libyasm/intnum.c b/libyasm/intnum.c
index dab359aba4d82e77d68639e6075f9ce0f8729e54..e39eb26f0f363bd543e34592ff767eeb8e471002 100644 (file)
--- a/libyasm/intnum.c
+++ b/libyasm/intnum.c
@@ -261,6 +261,7 @@ yasm_intnum_create_charconst_tasm(const char *str)
 {
     yasm_intnum *intn = yasm_xmalloc(sizeof(yasm_intnum));
     size_t len = strlen(str);
+    size_t i;
 
     if(len*8 > BITVECT_NATIVE_SIZE)
         yasm_error_set(YASM_ERROR_OVERFLOW,
@@ -276,7 +277,7 @@ yasm_intnum_create_charconst_tasm(const char *str)
     }
 
     /* tasm uses big endian notation */
-    int i = 0;
+    i = 0;
     switch (len) {
         case 3:
             intn->val.l |= ((unsigned long)str[i++]) & 0xff;

diff --git a/modules/preprocs/nasm/nasm-pp.c b/modules/preprocs/nasm/nasm-pp.c
index 3f6e2961a202a29075bcdd7869138eeadcf3158e..372f32b67722753ecfed418913da3848700a0d2d 100644 (file)
--- a/modules/preprocs/nasm/nasm-pp.c
+++ b/modules/preprocs/nasm/nasm-pp.c
@@ -878,7 +878,7 @@ check_tasm_directive(char *line)
                 break;
             /* segment register name */
             for (assume = TAssumes; assume->segreg; assume++)
-                if (strlen(assume->segreg) == q-p &&
+                if (strlen(assume->segreg) == (size_t)(q-p) &&
                     !strncasecmp(assume->segreg, p, q-p))
                     break;
             if (!assume->segreg) {
@@ -936,7 +936,7 @@ check_tasm_directive(char *line)
             if (!strcasecmp(q, struc->name)) {
                 char *r = q + len2 + 1, *s, *t, tasm_param[6];
                 struct TStrucField *field = struc->fields;
-                int size, n, m;
+                int size, n;
                 if (!oldchar2) {
                     error(ERR_FATAL, "Expected struc field initializer after %s %s", p, q);
                     return line;
@@ -1008,7 +1008,7 @@ check_tasm_directive(char *line)
     return line;
 }
 
-Token * tasm_join_tokens(Token *tline)
+static Token * tasm_join_tokens(Token *tline)
 {
     Token *t, *prev, *next;
     for (prev = NULL, t = tline; t; prev = t, t = next) {