Ver Fonte

Fix some compiler warnings

Oliver Hitz há 15 anos atrás
pai
commit
cb6486a400
3 ficheiros alterados com 7 adições e 7 exclusões
  1. 2 2
      src/docsis_decode.c
  2. 1 1
      src/docsis_decode.h
  3. 4 4
      src/docsis_snmp.c

+ 2 - 2
src/docsis_decode.c

@@ -468,10 +468,10 @@ str_isprint (const char *str, size_t str_len)
 
 
 void
-snprint_hexadecimal ( unsigned char *outbuf, size_t outsize, const char *str, size_t str_len )
+snprint_hexadecimal ( char *outbuf, size_t outsize, const char *str, size_t str_len )
 {
   unsigned int i;
-  unsigned char *cp;
+  char *cp;
 
   cp=outbuf;
 

+ 1 - 1
src/docsis_decode.h

@@ -50,7 +50,7 @@ void decode_vspecific(unsigned char *tlvbuf, symbol_type *sym, size_t length);
 int hexadecimal_to_binary(const char *string, unsigned char *out_buf);
 int str_isalpha (const char *str, size_t str_len);
 int str_isprint (const char *str, size_t str_len);
-void snprint_hexadecimal ( unsigned char *outbuf, size_t outsize, const char *str, size_t str_len );
+void snprint_hexadecimal ( char *outbuf, size_t outsize, const char *str, size_t str_len );
 
 void __docsis_indent ( int opCode, int doPrint );
 

+ 4 - 4
src/docsis_snmp.c

@@ -245,7 +245,7 @@ encode_vbind (char *oid_string, char oid_asntype, union t_val *value,
 	strncpy ((char *) buf, value->strval, SPRINT_MAX_LEN);
 	len = strlen ((char *) buf);
 
-	if (!read_objid (buf, oid_value, &oid_value_len))
+	if (!read_objid ((char *) buf, oid_value, &oid_value_len))
 	  {
 		printf ("Can't find oid %s at line %d\n", buf, line);
 		return 0;
@@ -563,18 +563,18 @@ decode_vbind (unsigned char *data, unsigned int vb_len)
   switch ((short) vp->type)
     {
     case ASN_OCTET_STR:
-	if (str_isprint(vp->val.string, vp->val_len))
+	if (str_isprint((char *) vp->val.string, vp->val_len))
 		{
 		 	snprintf(outbuf, vp->val_len+5, "\"%s\"", vp->val.string);
 		} else {
-			snprint_hexadecimal (outbuf, 1023, vp->val.string, vp->val_len);
+			snprint_hexadecimal (outbuf, 1023, (char *) vp->val.string, vp->val_len);
       			memset (_docsis_snmp_label, 0, 50);
       			sprintf (_docsis_snmp_label, "HexString");
 		}
 	break;
 
     case ASN_BIT_STR:
-		snprint_hexadecimal (outbuf, 1023, vp->val.bitstring, vp->val_len);
+		snprint_hexadecimal (outbuf, 1023, (char *) vp->val.bitstring, vp->val_len);
 		break;
     case ASN_OBJECT_ID:
       		netsnmp_ds_set_int (NETSNMP_DS_LIBRARY_ID,