Corrected some weird fgets() statements, plus reformatted them
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10616 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user