summaryrefslogtreecommitdiff
path: root/src/char_sql
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-25 15:21:53 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-25 15:21:53 +0000
commitb4d6bac9a4d623a9b32188458b26ae424d374bb3 (patch)
tree278b8f86ab39740f7b0dad0e726b10fc4198894a /src/char_sql
parentc842495d17863ebddaf64da006ceb642c70a9ad6 (diff)
downloadhercules-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/char_sql')
-rw-r--r--src/char_sql/char.c12
-rw-r--r--src/char_sql/int_guild.c3
-rw-r--r--src/char_sql/inter.c6
-rw-r--r--src/char_sql/itemdb.c3
4 files changed, 12 insertions, 12 deletions
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index a1fdc8835..ce09c43dd 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -3674,13 +3674,12 @@ int char_lan_config_read(const char *lancfgName)
ShowInfo("Reading the configuration file %s...\n", lancfgName);
- while(fgets(line, sizeof(line)-1, fp)) {
-
+ while(fgets(line, sizeof(line), fp))
+ {
line_num++;
if ((line[0] == '/' && line[1] == '/') || line[0] == '\n' || line[1] == '\n')
continue;
- line[sizeof(line)-1] = '\0';
if(sscanf(line,"%[^:]: %[^:]:%[^:]:%[^\r\n]", w1, w2, w3, w4) != 4) {
ShowWarning("Error syntax of configuration file %s in line %d.\n", lancfgName, line_num);
@@ -3726,7 +3725,8 @@ void sql_config_read(const char *cfgName)
exit(1);
}
- while(fgets(line, sizeof(line)-1, fp)){
+ while(fgets(line, sizeof(line), fp))
+ {
if(line[0] == '/' && line[1] == '/')
continue;
@@ -3826,11 +3826,11 @@ int char_config_read(const char *cfgName)
}
ShowInfo("Reading configuration file %s...\n", cfgName);
- while(fgets(line, sizeof(line)-1, fp)) {
+ while(fgets(line, sizeof(line), fp))
+ {
if (line[0] == '/' && line[1] == '/')
continue;
- line[sizeof(line)-1] = '\0';
if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2)
continue;
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
index 3ecaec839..e516da9e6 100644
--- a/src/char_sql/int_guild.c
+++ b/src/char_sql/int_guild.c
@@ -719,7 +719,8 @@ int inter_guild_ReadEXP(void)
return 1;
}
i=0;
- while(fgets(line,256,fp) && i<100){
+ while(fgets(line, sizeof(line), fp) && i < 100)
+ {
if(line[0]=='/' && line[1]=='/')
continue;
guild_exp[i]=(unsigned int)atof(line);
diff --git a/src/char_sql/inter.c b/src/char_sql/inter.c
index 0702ed3e7..8f2386a91 100644
--- a/src/char_sql/inter.c
+++ b/src/char_sql/inter.c
@@ -1,9 +1,6 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-// original code from athena
-// SQL conversion by Jioh L. Jung
-
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -204,7 +201,8 @@ static int inter_config_read(const char *cfgName)
ShowInfo("reading file %s...\n",cfgName);
- while(fgets(line, 1020, fp)){
+ while(fgets(line, sizeof(line), fp))
+ {
i=sscanf(line,"%[^:]: %[^\r\n]",w1,w2);
if(i!=2)
continue;
diff --git a/src/char_sql/itemdb.c b/src/char_sql/itemdb.c
index a5c2aa8f0..b03d76bfe 100644
--- a/src/char_sql/itemdb.c
+++ b/src/char_sql/itemdb.c
@@ -92,7 +92,8 @@ static int itemdb_readdb(void)
}
lines=0;
- while(fgets(line,1020,fp)){
+ while(fgets(line, sizeof(line), fp))
+ {
lines++;
if(line[0]=='/' && line[1]=='/')
continue;