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/common/core.c     | 8 ++++----
 src/common/grfio.c    | 6 ++++--
 src/common/mapindex.c | 3 ++-
 src/common/plugins.c  | 3 ++-
 src/common/socket.c   | 2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'src/common')

diff --git a/src/common/core.c b/src/common/core.c
index deac7a514..3cde639f6 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -139,7 +139,7 @@ const char* get_svn_revision(void)
 		char line[1024];
 		int rev;
 		// Check the version
-		if (fgets(line,sizeof(line),fp))
+		if (fgets(line, sizeof(line), fp))
 		{
 			if(!ISDIGIT(line[0]))
 			{
@@ -153,9 +153,9 @@ const char* get_svn_revision(void)
 			else
 			{
 				// Bin File format
-				fgets(line,sizeof(line),fp); // Get the name
-				fgets(line,sizeof(line),fp); // Get the entries kind
-				if(fgets(line,sizeof(line),fp)) // Get the rev numver
+				fgets(line, sizeof(line), fp); // Get the name
+				fgets(line, sizeof(line), fp); // Get the entries kind
+				if(fgets(line, sizeof(line), fp)) // Get the rev numver
 				{
 					snprintf(eA_svn_version, sizeof(eA_svn_version), "%d", atoi(line));
 				}
diff --git a/src/common/grfio.c b/src/common/grfio.c
index f5de9fbdb..4b68ea9fc 100644
--- a/src/common/grfio.c
+++ b/src/common/grfio.c
@@ -700,7 +700,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")))
@@ -807,7 +808,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/common/mapindex.c b/src/common/mapindex.c
index 36bd32cb5..e60287a38 100644
--- a/src/common/mapindex.c
+++ b/src/common/mapindex.c
@@ -115,7 +115,8 @@ void mapindex_init(void)
 		ShowFatalError("Unable to read mapindex config file %s!\n", mapindex_cfgfile);
 		exit(1); //Server can't really run without this file.
 	}
-	while(fgets(line,1020,fp)){
+	while(fgets(line, sizeof(line), fp))
+	{
 		if(line[0] == '/' && line[1] == '/')
 			continue;
 
diff --git a/src/common/plugins.c b/src/common/plugins.c
index 5a55e84e4..76dfc5956 100644
--- a/src/common/plugins.c
+++ b/src/common/plugins.c
@@ -303,7 +303,8 @@ static int plugins_config_read(const char *cfgName)
 		ShowError("File not found: %s\n", cfgName);
 		return 1;
 	}
-	while( fgets(line, 1020, fp) ){
+	while( fgets(line, sizeof(line), fp) )
+	{
 		if( line[0] == '/' && line[1] == '/' )
 			continue;
 		if( sscanf(line,"%[^:]: %[^\r\n]",w1,w2) != 2 )
diff --git a/src/common/socket.c b/src/common/socket.c
index 3d00ed8ce..11b273d61 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -898,7 +898,7 @@ int socket_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-70-g09d2