Explorar o código

size_t != unsigned int != int

Richard Laager %!s(int64=15) %!d(string=hai) anos
pai
achega
9b62c7edf1
Modificáronse 2 ficheiros con 8 adicións e 8 borrados
  1. 5 5
      src/docsis_snmp.c
  2. 3 3
      src/docsis_snmp.h

+ 5 - 5
src/docsis_snmp.c

@@ -29,7 +29,7 @@ extern unsigned int line;	/* from a.l */
 
 unsigned int
 encode_vbind (char *oid_string, char oid_asntype, union t_val *value,
-	      unsigned char *out_buffer, unsigned int out_size)
+	      unsigned char *out_buffer, size_t out_size)
 {
   oid var_name[MAX_OID_LEN];
   size_t name_len = MAX_OID_LEN;
@@ -277,7 +277,7 @@ decode_vbind (unsigned char *data, unsigned int vb_len)
   oid var_name[MAX_OID_LEN];	/* To test the objid */
   size_t name_len = MAX_OID_LEN;	/* To test the objid */
   int badtype=0;
-  unsigned int len;
+  size_t len;
   struct variable_list *vp;
   oid objid[MAX_OID_LEN];
   char _docsis_snmp_label[50];	/* To hold the 'name' of the type, i.e. Integer etc */
@@ -614,7 +614,7 @@ decode_vbind (unsigned char *data, unsigned int vb_len)
 
 unsigned int
 encode_snmp_oid (char *oid_string, unsigned char *out_buffer,
-	    unsigned int out_size)
+	    size_t out_size)
 {
   oid var_name[MAX_OID_LEN];
   size_t name_len = MAX_OID_LEN;
@@ -638,13 +638,13 @@ encode_snmp_oid (char *oid_string, unsigned char *out_buffer,
 }
 
 unsigned int
-decode_snmp_oid (unsigned char *data, unsigned int data_len)
+decode_snmp_oid (unsigned char *data, size_t data_len)
 {
   oid this_oid[MAX_OID_LEN];
   size_t oid_len = MAX_OID_LEN;
   unsigned char type;
   void *retval;			/* generic pointer, will only use to check return value */
-  int len;
+  size_t len;
   static char outbuf[1024];
 
   memset (outbuf, 0, 1024);

+ 3 - 3
src/docsis_snmp.h

@@ -33,10 +33,10 @@
 #include "docsis.h"
 
 unsigned int encode_vbind ( char *oid_string, char oid_asntype, union t_val *value,
-                        unsigned char *out_buffer, unsigned int out_size );
+                        unsigned char *out_buffer, size_t out_size );
 int decode_vbind ( unsigned char *, unsigned int);
-unsigned int encode_snmp_oid ( char *oid_string, unsigned char *out_buffer, unsigned int out_size );
-unsigned int decode_snmp_oid ( unsigned char *data, unsigned int data_len);
+unsigned int encode_snmp_oid ( char *oid_string, unsigned char *out_buffer, size_t out_size );
+unsigned int decode_snmp_oid ( unsigned char *data, size_t data_len);
 
 unsigned char *_docsis_snmp_build_var_op(unsigned char * data,
                   oid * var_name,