From b4d6bac9a4d623a9b32188458b26ae424d374bb3 Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 25 May 2007 15:21:53 +0000
Subject: 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
---
 src/txt-converter/char-converter.c  | 38 ++++++++++++++++++++++---------------
 src/txt-converter/login-converter.c | 10 ++++++----
 2 files changed, 29 insertions(+), 19 deletions(-)

(limited to 'src/txt-converter')

diff --git a/src/txt-converter/char-converter.c b/src/txt-converter/char-converter.c
index b1aae0ca5..9dd677938 100644
--- a/src/txt-converter/char-converter.c
+++ b/src/txt-converter/char-converter.c
@@ -55,7 +55,8 @@ int convert_init(void)
 			return 0;
 		}
 		lineno = count = 0;
-		while(fgets(line, 65535, fp)){
+		while(fgets(line, sizeof(line), fp))
+		{
 			lineno++;
 			memset(&char_dat, 0, sizeof(char_dat));
 			ret=mmo_char_fromstr(line, &char_dat.status, char_dat.global, &char_dat.global_num);
@@ -82,8 +83,9 @@ int convert_init(void)
 			ShowError("Unable to open file %s!", accreg_txt);
 			return 1;
 		}
-		lineno=count=0;
-		while(fgets(line, sizeof(line), fp)){
+		lineno = count = 0;
+		while(fgets(line, sizeof(line), fp))
+		{
 			lineno++;
 			memset (&reg, 0, sizeof(struct accreg));
 			if(inter_accreg_fromstr(line, &reg) == 0 && reg.account_id > 0) {
@@ -110,8 +112,9 @@ int convert_init(void)
 			ShowError("can't read : %s\n",storage_txt);
 			return 0;
 		}
-		lineno=count=0;
-		while(fgets(line,65535,fp)){
+		lineno = count = 0;
+		while(fgets(line, sizeof(line), fp))
+		{
 			lineno++;
 			set=sscanf(line,"%d,%d",&tmp_int[0],&tmp_int[1]);
 			if(set==2) {
@@ -142,8 +145,9 @@ int convert_init(void)
 			ShowError("Unable to open file %s!", pet_txt);
 			return 1;
 		}
-		lineno=count=0;
-		while(fgets(line, sizeof(line), fp)){
+		lineno = count = 0;
+		while(fgets(line, sizeof(line), fp))
+		{
 			lineno++;
 			memset (&p, 0, sizeof(struct s_pet));
 			if(inter_pet_fromstr(line, &p)==0 && p.pet_id>0){
@@ -170,8 +174,9 @@ int convert_init(void)
 			ShowError("Unable to open file %s!", party_txt);
 			return 1;
 		}
-		lineno=count=0;
-		while(fgets(line, sizeof(line), fp)){
+		lineno = count = 0;
+		while(fgets(line, sizeof(line), fp))
+		{
 			lineno++;
 			memset (&p, 0, sizeof(struct party));
 			if(inter_party_fromstr(line, &p) == 0 &&
@@ -200,8 +205,9 @@ int convert_init(void)
 			ShowError("Unable to open file %s!", guild_txt);
 			return 1;
 		}
-		lineno=count=0;
-		while(fgets(line, sizeof(line), fp)){
+		lineno = count = 0;
+		while(fgets(line, sizeof(line), fp))
+		{
 			lineno++;
 			memset (&g, 0, sizeof(struct guild));
 			if (inter_guild_fromstr(line, &g) == 0 &&
@@ -219,8 +225,9 @@ int convert_init(void)
 			ShowError("Unable to open file %s!", castle_txt);
 			return 1;
 		}
-		lineno=count=0;
-		while(fgets(line, sizeof(line), fp)){
+		lineno = count = 0;
+		while(fgets(line, sizeof(line), fp))
+		{
 			lineno++;
 			memset (&gc, 0, sizeof(struct guild_castle));
 			if (inter_guildcastle_fromstr(line, &gc) == 0) {
@@ -247,8 +254,9 @@ int convert_init(void)
 			ShowError("can't read : %s\n",guild_storage_txt);
 			return 0;
 		}
-		lineno=count=0;
-		while(fgets(line,65535,fp)){
+		lineno = count = 0;
+		while(fgets(line, sizeof(line), fp))
+		{
 			lineno++;
 			memset(&storage_, 0, sizeof(struct guild_storage));
 			if (sscanf(line,"%d",&storage_.guild_id) == 1 &&
diff --git a/src/txt-converter/login-converter.c b/src/txt-converter/login-converter.c
index 020fd8008..687689dad 100644
--- a/src/txt-converter/login-converter.c
+++ b/src/txt-converter/login-converter.c
@@ -67,7 +67,8 @@ int read_gm_account()
 
 	if( (fp=fopen("conf/GM_account.txt","r"))==NULL )
 		return 1;
-	while(fgets(line,sizeof(line),fp)){
+	while(fgets(line,sizeof(line),fp))
+	{
 		if(line[0] == '/' || line[1] == '/' || line[2] == '/')
 			continue;
 
@@ -124,8 +125,8 @@ int mmo_auth_init(void)
 	auth_dat = (struct auth_dat_*)malloc(sizeof(auth_dat[0])*256);
 	if(fp==NULL)
 		return 0;
-	while(fgets(line,1023,fp)!=NULL){
-
+	while(fgets(line,1023,fp)!=NULL)
+	{
 		if(line[0]=='/' && line[1]=='/')
 			continue;
 
@@ -175,7 +176,8 @@ int login_config_read(const char *cfgName)
 		return 1;
 	}
 
-	while(fgets(line, 1020, fp)){
+	while(fgets(line, sizeof(line), fp))
+	{
 		if(line[0] == '/' && line[1] == '/')
 			continue;
 
-- 
cgit v1.2.3-60-g2f50