Branch b1_8

b=20819

i=johann

Get rid of warning messages for snmp build.

diff --git a/snmp/lustre-snmp-trap.c b/snmp/lustre-snmp-trap.c
index 9b6073d..910e9de 100644 (file)
--- a/snmp/lustre-snmp-trap.c
+++ b/snmp/lustre-snmp-trap.c
@@ -59,6 +59,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <ctype.h>
 #include "lustre-snmp-util.h"
 
 /**************************************************************************
@@ -364,7 +365,7 @@ void send_portals_catastrophe_trap(char *reason_string)
 
     /*And the data is a octet string, that contains the actually reason string*/
     var_trap[1].type = ASN_OCTET_STR;
-    var_trap[1].val.string = reason_string;
+    var_trap[1].val.string = (unsigned char *)reason_string;
     var_trap[1].val_len = strlen(reason_string);
 
     /*And now send off the trap*/
@@ -419,7 +420,7 @@ void send_obd_unhealthy_trap(char *obd_name,char *reason_string)
 
     /*And the data is a octet string, that contains the actually reason strong*/
     var_trap[1].type = ASN_OCTET_STR;
-    var_trap[1].val.string = obd_name;
+    var_trap[1].val.string = (unsigned char *)obd_name;
     var_trap[1].val_len = strlen(obd_name);
 
     /* 
@@ -434,7 +435,7 @@ void send_obd_unhealthy_trap(char *obd_name,char *reason_string)
 
     /*And the data is a octet string, that contains the actually reason strong*/
     var_trap[2].type = ASN_OCTET_STR;
-    var_trap[2].val.string = reason_string;
+    var_trap[2].val.string = (unsigned char *)reason_string;
     var_trap[2].val_len = strlen(reason_string);
 
     /*And now send off the trap*/

diff --git a/snmp/lustre-snmp-util.c b/snmp/lustre-snmp-util.c
index 61fbd2e..56d4344 100644 (file)
--- a/snmp/lustre-snmp-util.c
+++ b/snmp/lustre-snmp-util.c
@@ -296,8 +296,6 @@ void lustrefs_ctrl(int command)
 
 int get_sysstatus(void)
 {
-    FILE    *fptr = NULL;
-    int     len = 0;
     int     ret_val = ERROR ;
     char    sys_status[50] = {0};
     
@@ -542,9 +540,9 @@ unsigned char*
         size_t  *var_len)
 {
     static unsigned char string[SPRINT_MAX_LEN];
-    if( SUCCESS != read_string(file_path, string,sizeof(string)))
+    if( SUCCESS != read_string(file_path, (char *)string,sizeof(string)))
         return NULL;
-    *var_len = strlen(string);
+    *var_len = strlen((char *)string);
     return (unsigned char *) string;
 }
 

diff --git a/snmp/lustre-snmp-util.h b/snmp/lustre-snmp-util.h
index b1ee87c..b2c85eb 100644 (file)
--- a/snmp/lustre-snmp-util.h
+++ b/snmp/lustre-snmp-util.h
@@ -220,4 +220,11 @@ unsigned char *
 int stats_values(char * filepath,char * name_value, unsigned long long * nb_sample, unsigned long long * min, unsigned long long * max, unsigned long long * sum, unsigned long long * sum_square);
 extern int mds_stats_values(char * name_value, unsigned long long * nb_sample, unsigned long long * min, unsigned long long * max, unsigned long long * sum, unsigned long long * sum_square);
 
+ /* export for net-snmp util-funcs */
+int             header_simple_table(struct variable *, oid *, size_t *,
+                                    int, size_t *,
+                                    WriteMethod ** write_method, int);
+int             header_generic(struct variable *, oid *, size_t *, int,
+                               size_t *, WriteMethod **);
+
 #endif /* LUSTRE_SNMP_UTIL_H */

diff --git a/snmp/lustre-snmp.c b/snmp/lustre-snmp.c
index 6e94165..5dc19b4 100644 (file)
--- a/snmp/lustre-snmp.c
+++ b/snmp/lustre-snmp.c
@@ -238,23 +238,23 @@ var_clusterFileSystems(struct variable *vp,
 
     case SYSVERSION:
         sprintf(file_path, "%s%s", LUSTRE_PATH,"version");
-        if( SUCCESS != read_string(file_path, string,sizeof(string)))
+        if( SUCCESS != read_string(file_path, (char *)string,sizeof(string)))
             return NULL;
-        *var_len = strlen(string);
+        *var_len = strlen((char *)string);
         return (unsigned char *) string;
 
     case SYSKERNELVERSION:
         sprintf(file_path, "%s%s", LUSTRE_PATH,"kernel_version");
-        if( SUCCESS != read_string(file_path, string,sizeof(string)))
+        if( SUCCESS != read_string(file_path, (char *)string,sizeof(string)))
             return NULL;
-        *var_len = strlen(string);
+        *var_len = strlen((char *)string);
         return (unsigned char *) string;
 
     case SYSHEALTHCHECK:
         sprintf(file_path, "%s%s", LUSTRE_PATH,FILENAME_SYSHEALTHCHECK);
-        if( SUCCESS != read_string(file_path, string,sizeof(string)))
+        if( SUCCESS != read_string(file_path, (char *)string,sizeof(string)))
             return NULL;
-        *var_len = strlen(string);
+        *var_len = strlen((char*)string);
         return (unsigned char *) string;
 
     case SYSSTATUS:

diff --git a/snmp/lustre-snmp.h b/snmp/lustre-snmp.h
index 2f4e8e9..3c0c5fb 100644 (file)
--- a/snmp/lustre-snmp.h
+++ b/snmp/lustre-snmp.h
@@ -42,6 +42,7 @@
 #define LUSTRE_SNMP_H
 
 #include "lustre-snmp-util.h"
+#include "lustre-snmp-trap.h"
 
 config_require(util_funcs)
 config_add_mib(LUSTRE-MIB)