Commit cdef24c9 authored by Randy Dunlap's avatar Randy Dunlap Committed by Tony Luck

[IA64] aliasing-test: fix gcc warnings on non-ia64

Eliminate all build warnings.  OK, these build warnings are from
a build on x86_64.  When I build on ia64, I don't see warnings.

Now builds cleanly on ia64 and x86_64.

Documentation/ia64/aliasing-test.c: In function 'map_mem':
Documentation/ia64/aliasing-test.c:39: warning: implicit declaration of function 'ioctl'
Documentation/ia64/aliasing-test.c: In function 'scan_rom':
Documentation/ia64/aliasing-test.c:183: warning: format '%ld' expects type 'long int', but argument 4 has type 'int'
Documentation/ia64/aliasing-test.c: At top level:
Documentation/ia64/aliasing-test.c:208: warning: function declaration isn't a prototype
Documentation/ia64/aliasing-test.c: In function 'main':
Documentation/ia64/aliasing-test.c:259: warning: control reaches end of non-void function
Documentation/ia64/aliasing-test.c: In function 'scan_rom':
Documentation/ia64/aliasing-test.c:152: warning: 'rc' may be used uninitialized in this function
Documentation/ia64/aliasing-test.c: In function 'scan_tree':
Documentation/ia64/aliasing-test.c:68: warning: 'rc' may be used uninitialized in this function
Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Acked-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 5302ac50
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <fnmatch.h> #include <fnmatch.h>
#include <string.h> #include <string.h>
#include <sys/ioctl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
...@@ -65,7 +66,7 @@ int scan_tree(char *path, char *file, off_t offset, size_t length, int touch) ...@@ -65,7 +66,7 @@ int scan_tree(char *path, char *file, off_t offset, size_t length, int touch)
{ {
struct dirent **namelist; struct dirent **namelist;
char *name, *path2; char *name, *path2;
int i, n, r, rc, result = 0; int i, n, r, rc = 0, result = 0;
struct stat buf; struct stat buf;
n = scandir(path, &namelist, 0, alphasort); n = scandir(path, &namelist, 0, alphasort);
...@@ -113,7 +114,7 @@ int scan_tree(char *path, char *file, off_t offset, size_t length, int touch) ...@@ -113,7 +114,7 @@ int scan_tree(char *path, char *file, off_t offset, size_t length, int touch)
free(namelist[i]); free(namelist[i]);
} }
free(namelist); free(namelist);
return rc; return result;
} }
char buf[1024]; char buf[1024];
...@@ -149,7 +150,7 @@ int scan_rom(char *path, char *file) ...@@ -149,7 +150,7 @@ int scan_rom(char *path, char *file)
{ {
struct dirent **namelist; struct dirent **namelist;
char *name, *path2; char *name, *path2;
int i, n, r, rc, result = 0; int i, n, r, rc = 0, result = 0;
struct stat buf; struct stat buf;
n = scandir(path, &namelist, 0, alphasort); n = scandir(path, &namelist, 0, alphasort);
...@@ -180,7 +181,7 @@ int scan_rom(char *path, char *file) ...@@ -180,7 +181,7 @@ int scan_rom(char *path, char *file)
* important thing is that no MCA happened. * important thing is that no MCA happened.
*/ */
if (rc > 0) if (rc > 0)
fprintf(stderr, "PASS: %s read %ld bytes\n", path2, rc); fprintf(stderr, "PASS: %s read %d bytes\n", path2, rc);
else { else {
fprintf(stderr, "PASS: %s not readable\n", path2); fprintf(stderr, "PASS: %s not readable\n", path2);
return rc; return rc;
...@@ -201,10 +202,10 @@ int scan_rom(char *path, char *file) ...@@ -201,10 +202,10 @@ int scan_rom(char *path, char *file)
free(namelist[i]); free(namelist[i]);
} }
free(namelist); free(namelist);
return rc; return result;
} }
int main() int main(void)
{ {
int rc; int rc;
...@@ -256,4 +257,6 @@ int main() ...@@ -256,4 +257,6 @@ int main()
scan_tree("/proc/bus/pci", "??.?", 0xA0000, 0x20000, 0); scan_tree("/proc/bus/pci", "??.?", 0xA0000, 0x20000, 0);
scan_tree("/proc/bus/pci", "??.?", 0xC0000, 0x40000, 1); scan_tree("/proc/bus/pci", "??.?", 0xC0000, 0x40000, 1);
scan_tree("/proc/bus/pci", "??.?", 0, 1024*1024, 0); scan_tree("/proc/bus/pci", "??.?", 0, 1024*1024, 0);
return rc;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment