aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2008-02-04 18:23:10 -0500
committerTony Luck <tony.luck@intel.com>2008-02-04 18:23:10 -0500
commitcdef24c9cd38ae236065409c4a6289f165639e55 (patch)
tree3a5f41a0e8bb7643fc9e1ff4fab159422f121129
parent5302ac5019367470e123cb91844a28d6941e6912 (diff)
[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: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--Documentation/ia64/aliasing-test.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/Documentation/ia64/aliasing-test.c b/Documentation/ia64/aliasing-test.c
index 773a814d4093..d23610fb2ff9 100644
--- a/Documentation/ia64/aliasing-test.c
+++ b/Documentation/ia64/aliasing-test.c
@@ -16,6 +16,7 @@
16#include <fcntl.h> 16#include <fcntl.h>
17#include <fnmatch.h> 17#include <fnmatch.h>
18#include <string.h> 18#include <string.h>
19#include <sys/ioctl.h>
19#include <sys/mman.h> 20#include <sys/mman.h>
20#include <sys/stat.h> 21#include <sys/stat.h>
21#include <unistd.h> 22#include <unistd.h>
@@ -65,7 +66,7 @@ int scan_tree(char *path, char *file, off_t offset, size_t length, int touch)
65{ 66{
66 struct dirent **namelist; 67 struct dirent **namelist;
67 char *name, *path2; 68 char *name, *path2;
68 int i, n, r, rc, result = 0; 69 int i, n, r, rc = 0, result = 0;
69 struct stat buf; 70 struct stat buf;
70 71
71 n = scandir(path, &namelist, 0, alphasort); 72 n = scandir(path, &namelist, 0, alphasort);
@@ -113,7 +114,7 @@ skip:
113 free(namelist[i]); 114 free(namelist[i]);
114 } 115 }
115 free(namelist); 116 free(namelist);
116 return rc; 117 return result;
117} 118}
118 119
119char buf[1024]; 120char buf[1024];
@@ -149,7 +150,7 @@ int scan_rom(char *path, char *file)
149{ 150{
150 struct dirent **namelist; 151 struct dirent **namelist;
151 char *name, *path2; 152 char *name, *path2;
152 int i, n, r, rc, result = 0; 153 int i, n, r, rc = 0, result = 0;
153 struct stat buf; 154 struct stat buf;
154 155
155 n = scandir(path, &namelist, 0, alphasort); 156 n = scandir(path, &namelist, 0, alphasort);
@@ -180,7 +181,7 @@ int scan_rom(char *path, char *file)
180 * important thing is that no MCA happened. 181 * important thing is that no MCA happened.
181 */ 182 */
182 if (rc > 0) 183 if (rc > 0)
183 fprintf(stderr, "PASS: %s read %ld bytes\n", path2, rc); 184 fprintf(stderr, "PASS: %s read %d bytes\n", path2, rc);
184 else { 185 else {
185 fprintf(stderr, "PASS: %s not readable\n", path2); 186 fprintf(stderr, "PASS: %s not readable\n", path2);
186 return rc; 187 return rc;
@@ -201,10 +202,10 @@ skip:
201 free(namelist[i]); 202 free(namelist[i]);
202 } 203 }
203 free(namelist); 204 free(namelist);
204 return rc; 205 return result;
205} 206}
206 207
207int main() 208int main(void)
208{ 209{
209 int rc; 210 int rc;
210 211
@@ -256,4 +257,6 @@ int main()
256 scan_tree("/proc/bus/pci", "??.?", 0xA0000, 0x20000, 0); 257 scan_tree("/proc/bus/pci", "??.?", 0xA0000, 0x20000, 0);
257 scan_tree("/proc/bus/pci", "??.?", 0xC0000, 0x40000, 1); 258 scan_tree("/proc/bus/pci", "??.?", 0xC0000, 0x40000, 1);
258 scan_tree("/proc/bus/pci", "??.?", 0, 1024*1024, 0); 259 scan_tree("/proc/bus/pci", "??.?", 0, 1024*1024, 0);
260
261 return rc;
259} 262}