diff options
author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-25 15:21:53 +0000 |
---|---|---|
committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-25 15:21:53 +0000 |
commit | b4d6bac9a4d623a9b32188458b26ae424d374bb3 (patch) | |
tree | 278b8f86ab39740f7b0dad0e726b10fc4198894a /src/tool | |
parent | c842495d17863ebddaf64da006ceb642c70a9ad6 (diff) | |
download | hercules-b4d6bac9a4d623a9b32188458b26ae424d374bb3.tar.gz hercules-b4d6bac9a4d623a9b32188458b26ae424d374bb3.tar.bz2 hercules-b4d6bac9a4d623a9b32188458b26ae424d374bb3.tar.xz hercules-b4d6bac9a4d623a9b32188458b26ae424d374bb3.zip |
Corrected some weird fgets() statements, plus reformatted them
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10616 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/tool')
-rw-r--r-- | src/tool/adduser.c | 3 | ||||
-rw-r--r-- | src/tool/convert.c | 3 | ||||
-rw-r--r-- | src/tool/grfio.c | 6 | ||||
-rw-r--r-- | src/tool/mapcache.c | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/tool/adduser.c b/src/tool/adduser.c index 592729df6..1140bd6ff 100644 --- a/src/tool/adduser.c +++ b/src/tool/adduser.c @@ -50,7 +50,8 @@ int main(int argc, char *argv[]) } next_id = 2000000; - while(fgets(line, sizeof(line)-1, FPaccin)) { + while(fgets(line, sizeof(line), FPaccin)) + { if (line[0] == '/' && line[1] == '/') { continue; } if (sscanf(line, "%d\t%%newid%%\n", &id) == 1) { if (next_id < id) { diff --git a/src/tool/convert.c b/src/tool/convert.c index 5cb096fdb..2959eb826 100644 --- a/src/tool/convert.c +++ b/src/tool/convert.c @@ -276,7 +276,8 @@ int mmo_char_convert(char *fname1,char *fname2) printf("file open error %s\n",fname2); return 0; } - while(fgets(line,65535,ifp)){ + while(fgets(line, sizeof(line), ifp)) + { memset(&char_dat,0,sizeof(struct mmo_charstatus)); ret=mmo_char_fromstr(line,&char_dat); if(ret){ diff --git a/src/tool/grfio.c b/src/tool/grfio.c index 2961dc0ec..b9c03cbc5 100644 --- a/src/tool/grfio.c +++ b/src/tool/grfio.c @@ -703,7 +703,8 @@ static void grfio_resourcecheck(void) fp = fopen(restable, "rb"); if (fp) { - while (fgets(line, sizeof(line) - 1, fp)) { + while(fgets(line, sizeof(line), fp)) + { if (sscanf(line, "%[^#]#%[^#]#", w1, w2) == 2 && // we only need the maps' GAT and RSW files (strstr(w2, ".gat") || strstr(w2, ".rsw"))) @@ -806,7 +807,8 @@ void grfio_init(char* fname) data_conf = fopen(fname, "r"); // It will read, if there is grf-files.txt. if (data_conf) { - while(fgets(line, sizeof(line) - 1, data_conf)) { + while(fgets(line, sizeof(line), data_conf)) + { if (line[0] == '/' && line[1] == '/') continue; if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2) diff --git a/src/tool/mapcache.c b/src/tool/mapcache.c index 5db46c123..095245da4 100644 --- a/src/tool/mapcache.c +++ b/src/tool/mapcache.c @@ -296,8 +296,8 @@ int main(int argc, char *argv[]) } // Read and process the map list - while(fgets(line, 1020, list)){ - + while(fgets(line, sizeof(line), list)) + { if(line[0] == '/' && line[1] == '/') continue; |