- [ZBX-70] fixed even more compilation warnings (Alexei)

   [svn merge -r4773:4776 svn://svn.zabbix.com/branches/1.4]


git-svn-id: svn://svn.zabbix.com/trunk@4777 97f52cf1-0a1b-0410-bd0e-c28be96e8082

5 files changed, 26 insertions, 6 deletions

diff --git a/src/libs/zbxnix/daemon.c b/src/libs/zbxnix/daemon.c
index a7ead1e4..f6a94ec0 100644
--- a/src/libs/zbxnix/daemon.c
+++ b/src/libs/zbxnix/daemon.c
@@ -131,7 +131,11 @@ int	daemon_start(int allow_root)
 		exit( 0 );		
 	}				
 
-	chdir("/");
+	/* This is to eliminate warning: ignoring return value of chdir */
+	if(-1 == chdir("/"))
+	{
+		assert(0);
+	}
 	umask(0002);
 
 	redirect_std(CONFIG_LOG_FILE);
diff --git a/src/libs/zbxsysinfo/common/common.c b/src/libs/zbxsysinfo/common/common.c
index ea7f5be7..8693d43f 100644
--- a/src/libs/zbxsysinfo/common/common.c
+++ b/src/libs/zbxsysinfo/common/common.c
@@ -103,7 +103,11 @@ int	getPROC(char *file, int lineno, int fieldno, unsigned flags, AGENT_RESULT *r
 
 	for(i=1; i<=lineno; i++)
 	{	
-		fgets(c,MAX_STRING_LEN,f);
+		if(NULL == fgets(c,MAX_STRING_LEN,f))
+		{
+			zbx_fclose(f);
+			return	SYSINFO_RET_FAIL;
+		}
 	}
 
 	t=(char *)strtok(c," ");
diff --git a/src/libs/zbxsysinfo/linux/proc.c b/src/libs/zbxsysinfo/linux/proc.c
index 1e8ecff5..2405cc38 100644
--- a/src/libs/zbxsysinfo/linux/proc.c
+++ b/src/libs/zbxsysinfo/linux/proc.c
@@ -160,7 +160,10 @@ int     PROC_MEMORY(const char *cmd, const char *param, unsigned flags, AGENT_RE
 
 			if(procname[0] != 0)
 			{
-				fgets(line,MAX_STRING_LEN,f);
+				if(NULL == fgets(line,MAX_STRING_LEN,f))
+				{
+					continue;
+				}
 				if(sscanf(line,"%s\t%s\n",name1,name2)==2)
 				{
 					if(strcmp(name1,"Name:") == 0)
@@ -449,7 +452,10 @@ int	    PROC_NUM(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
 		proc_ok = 0;
                 if(procname[0] != 0)
                 {
-                    fgets(line,MAX_STRING_LEN,f);
+                    if(NULL == fgets(line,MAX_STRING_LEN,f))
+			{
+				continue;
+			}
                     if(sscanf(line,"%s\t%s\n",name1,name2)==2)
                     {
                         if(strcmp(name1,"Name:") == 0)
diff --git a/src/libs/zbxsysinfo/linux/sensors.c b/src/libs/zbxsysinfo/linux/sensors.c
index 27ca6c8a..91c4b60b 100644
--- a/src/libs/zbxsysinfo/linux/sensors.c
+++ b/src/libs/zbxsysinfo/linux/sensors.c
@@ -56,7 +56,11 @@ static int	get_sensor(const char *name, unsigned flags, AGENT_RESULT *result)
 			{
 				continue;
 			}
-			fgets(line,MAX_STRING_LEN,f);
+			if(NULL == fgets(line,MAX_STRING_LEN,f))
+			{
+				zbx_fclose(f);
+				continue;
+			}
 			zbx_fclose(f);
 
 			if(sscanf(line,"%lf\t%lf\t%lf\n",&d1, &d2, &d3) == 3)
diff --git a/src/zabbix_server/poller/poller.c b/src/zabbix_server/poller/poller.c
index dc346450..e945d5fb 100644
--- a/src/zabbix_server/poller/poller.c
+++ b/src/zabbix_server/poller/poller.c
@@ -320,7 +320,9 @@ int get_values(void)
 	/* Do not stop when select is made by poller for unreachable hosts */
 	while((row=DBfetch(result))&&(stop==0 || poller_type == ZBX_POLLER_TYPE_UNREACHABLE))
 	{
-		result2 = NULL;
+		/* This code is just to avoid compilation warining about use of uninitialized result2 */
+		result2 = result;
+		/* */
 
 		/* Poller for unreachable hosts */
 		if(poller_type == ZBX_POLLER_TYPE_UNREACHABLE)