Changeset 1864

Timestamp:

05/26/12 06:46:50 (12 months ago)

Author:

philmoz

Message:

Minor update to stop compiler warnings when building tools on 64 bit Linux.

Location:

trunk/tools

Files:

• elf2flt/elf-arm.c (modified) (4 diffs)
• elf2flt/elfflt.c (modified) (1 diff)
• finsig_dryos.c (modified) (5 diffs, 1 prop)
• finsig_vxworks.c (modified) (1 diff, 1 prop)
• gensig_dryos.c (modified) (1 diff, 1 prop)
• gensig_vxworks.c (modified) (1 diff, 1 prop)
• makeexport.c (modified) (1 diff)
• makelang.c (modified) (1 diff, 1 prop)

trunk/tools/elf2flt/elf-arm.c

@@ -59 +59 @@
                         if ( FLAG_DUMP_RELOC )
                                 printf( "R_ARM_ABS32: %p(%s+0x%x=%x): ptr=%x [%s+0x%x+0x%x] sym:%s\n", 
-                                        (char*)base_sect->base_addr+rela->r_offset,  base_sect->name, rela->r_offset, locoffset,
+                                        base_sect->base_addr+rela->r_offset,  base_sect->name, rela->r_offset, locoffset,
                                         tgt_sect->base_addr + addend + sym->st_value,
                                         tgt_sect->name, sym->st_value, addend, symname
@@ -123 +123 @@
                           if ( FLAG_DUMP_RELOC )
                         printf( "R_ARM_THM_CALL: %p(%s+0x%x=%x):  %04x %04x ptr=%x [loc%-d] sym:%s\n", 
-                                        (char*)base_sect->base_addr+rela->r_offset,  base_sect->name, rela->r_offset, locoffset,
+                                        base_sect->base_addr+rela->r_offset,  base_sect->name, rela->r_offset, locoffset,
                                         upper, lower,
                                         tgt_sect->base_addr+rela->r_offset+offset, offset,
@@ -191 +191 @@
                           if ( FLAG_DUMP_RELOC ) {
                         printf( "%s: %p(%s+0x%x=%x):  %08x ptr=%x [loc%-d] sym:%s\n", reloc_name,
-                                        (char*)base_sect->base_addr+rela->r_offset,  base_sect->name, rela->r_offset, locoffset,
+                                        base_sect->base_addr+rela->r_offset,  base_sect->name, rela->r_offset, locoffset,
                                         *(uint32_t *)loc,
                                         base_sect->base_addr+rela->r_offset+offset*4, offset*4,
@@ -238 +238 @@
                 if ( FLAG_DUMP_RELOC )
                                 printf( "R_ARM_ABS32: %p(%s+0x%x=%x): import_value=%d (sym:%s)+0x%x %d\n", 
-                                        (char*)base_sect->base_addr+rela->r_offset,  base_sect->name, rela->r_offset, locoffset,
+                                        base_sect->base_addr+rela->r_offset,  base_sect->name, rela->r_offset, locoffset,
                                          importidx, symname, *(uint32_t*)loc, flat_import_count
                                                 );

trunk/tools/elf2flt/elfflt.c

@@ -745 +745 @@
 
   int output_fd = open(fltfile,O_WRONLY|O_CREAT|O_TRUNC|O_BINARY,0777);
-  write(output_fd, flat_buf, flat->import_start);
-  write(output_fd, flat_import_buf, flat_import_count*sizeof(import_record_t));
+  i = write(output_fd, flat_buf, flat->import_start);
+  i = write(output_fd, flat_import_buf, flat_import_count*sizeof(import_record_t));
   close(output_fd);
 

trunk/tools/finsig_dryos.c

@@ -799 +799 @@
 {
     FILE *f = fopen(filename, "rb");
+    int k;
 
     if (f == NULL)
@@ -815 +816 @@
     // Allows sig matching past end of firmware without checking each time in the inner loop
     fw->buf = malloc((fw->size+32)*4);
-    fread(fw->buf, 4, fw->size, f);
+    k = fread(fw->buf, 4, fw->size, f);
     fclose(f);
         
@@ -824 +825 @@
         // Get DRYOS version
         fw->dryos_ver = 0;
-        int k = find_str(fw, "DRYOS version 2.3, release #");
+        k = find_str(fw, "DRYOS version 2.3, release #");
         if (k == -1)
         {
@@ -1470 +1471 @@
 
         ignore_names = malloc(size+1);
-        fread(ignore_names, 1, size, f);
+        size = fread(ignore_names, 1, size, f);
         ignore_names[size] = 0;
 
@@ -2490 +2491 @@
                 if (opt == 1) return;
                 char fmt[50] = "";
-                sprintf(fmt, "// ERROR: %%s is not found. %%%ds//--- --- ", 34-strlen(curr_name));
+                sprintf(fmt, "// ERROR: %%s is not found. %%%ds//--- --- ", (int)(34-strlen(curr_name)));
                 sprintf(line+strlen(line), fmt, curr_name, "");
         }

trunk/tools/finsig_vxworks.c

@@ -138 +138 @@
     // Allows sig matching past end of firmware without checking each time in the inner loop
     buf=malloc((size+32)*4);
-    fread(buf, 4, size, f);
+    i = fread(buf, 4, size, f);
     fclose(f);
     memset(&buf[size],0xff,32*4);

trunk/tools/gensig_dryos.c

@@ -293 +293 @@
 
     fseek(f, pos, SEEK_SET);
-    fread(buf, 4, size, f);
+    i = fread(buf, 4, size, f);
 
     for (i=0;i<size;++i){

trunk/tools/gensig_vxworks.c

@@ -298 +298 @@
 
     fseek(f, pos, SEEK_SET);
-    fread(buf, 4, size, f);
+    i = fread(buf, 4, size, f);
 
     printf("static FuncSig func_sig_%s[] = {\n",proc_name);

trunk/tools/makeexport.c

@@ -1 +1 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <math.h>
 

trunk/tools/makelang.c

@@ -1 +1 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <math.h>