瀏覽代碼

clean up compiler warnings

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@767 f882894a-f735-0410-b71e-b25c423dba1c
Karl DeBisschop 22 年之前
父節點
當前提交
95c6a6d05d
共有 2 個文件被更改,包括 7 次插入9 次删除
  1. 3 3
      plugins/check_mrtg.c
  2. 4 6
      plugins/check_nt.c

+ 3 - 3
plugins/check_mrtg.c

@@ -140,9 +140,9 @@ main (int argc, char **argv)
 		asprintf (&message, "%s. %s = %lu %s|%s",
 		          (use_average == TRUE) ? _("Avg") : _("Max"),
 		          label, rate, units,
-		          perfdata(label, rate, units,
-		                   value_warning_threshold, value_warning_threshold,
-		                   value_critical_threshold, value_critical_threshold,
+		          perfdata(label, (long) rate, units,
+		                   (int) value_warning_threshold, (long) value_warning_threshold,
+		                   (int) value_critical_threshold, (long) value_critical_threshold,
 		                   0, 0, 0, 0));
 	}
 

+ 4 - 6
plugins/check_nt.c

@@ -118,7 +118,7 @@ int main(int argc, char **argv){
 			asprintf (&output_message, _("Wrong client version - running: %s, required: %s"), recv_buffer, value_list);
 			return_code = STATE_WARNING;
 		} else {
-			asprintf (&output_message, recv_buffer);
+			asprintf (&output_message, "%s", recv_buffer);
 			return_code = STATE_OK;
 		}
 		break;
@@ -238,12 +238,11 @@ int main(int argc, char **argv){
 			mem_commitLimit / 1048576, mem_commitByte / 1048567, percent_used_space,  
 			(mem_commitLimit - mem_commitByte) / 1048576, (mem_commitLimit - mem_commitByte) / mem_commitLimit * 100);
 	
+		return_code=STATE_OK;
 		if(check_critical_value==TRUE && percent_used_space >= critical_value)
 			return_code=STATE_CRITICAL;
 		else if (check_warning_value==TRUE && percent_used_space >= warning_value)
 			return_code=STATE_WARNING;	
-		else
-			return_code=STATE_OK;	
 
 		break;
 
@@ -273,13 +272,12 @@ int main(int argc, char **argv){
 					return_code=STATE_OK;	
 			} 
 			else {                                       /* inverse thresholds */
+				return_code=STATE_OK;
 				if(check_critical_value==TRUE && counter_value <= critical_value)
 					return_code=STATE_CRITICAL;
 				else if (check_warning_value==TRUE && counter_value <= warning_value)
 					return_code=STATE_WARNING;	
-				else
-					return_code=STATE_OK;	
-			}	
+			}
 		}
 		break;