lytboris                                 Thu, 21 Jul 2011 12:47:07 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=313532

Log:
s/noOIDIncreasingCheck/oid_increasing_check/

Changed paths:
    U   php/php-src/trunk/ext/snmp/php_snmp.h
    U   php/php-src/trunk/ext/snmp/snmp.c
    U   php/php-src/trunk/ext/snmp/tests/snmp-object-properties.phpt

Modified: php/php-src/trunk/ext/snmp/php_snmp.h
===================================================================
--- php/php-src/trunk/ext/snmp/php_snmp.h       2011-07-21 12:27:00 UTC (rev 
313531)
+++ php/php-src/trunk/ext/snmp/php_snmp.h       2011-07-21 12:47:07 UTC (rev 
313532)
@@ -93,7 +93,7 @@
        int enum_print;
        int oid_output_format;
        int snmp_errno;
-       int noOIDIncreasingCheck;
+       int oid_increasing_check;
        char snmp_errstr[128];
 } php_snmp_object;


Modified: php/php-src/trunk/ext/snmp/snmp.c
===================================================================
--- php/php-src/trunk/ext/snmp/snmp.c   2011-07-21 12:27:00 UTC (rev 313531)
+++ php/php-src/trunk/ext/snmp/snmp.c   2011-07-21 12:47:07 UTC (rev 313532)
@@ -376,7 +376,7 @@
        long max_repetitions;
        int valueretrieval;
        int array_output;
-       int noOIDIncreasingCheck;
+       int oid_increasing_check;
        snmpobjarg *vars;
 };

@@ -879,7 +879,7 @@

                                        /* OID increase check */
                                        if (st & SNMP_CMD_WALK) {
-                                               if 
(objid_query->noOIDIncreasingCheck == FALSE && snmp_oid_compare(name, 
name_length, vars->name, vars->name_length) >= 0) {
+                                               if 
(objid_query->oid_increasing_check == TRUE && snmp_oid_compare(name, 
name_length, vars->name, vars->name_length) >= 0) {
                                                        snprint_objid(buf2, 
sizeof(buf2), vars->name, vars->name_length);
                                                        
php_snmp_error(getThis(), NULL TSRMLS_CC, PHP_SNMP_ERRNO_OID_NOT_INCREASING, 
"Error: OID not increasing: %s", buf2);
                                                        keepwalking = 0;
@@ -1332,7 +1332,7 @@
        objid_query.max_repetitions = -1;
        objid_query.non_repeaters = 0;
        objid_query.valueretrieval = SNMP_G(valueretrieval);
-       objid_query.noOIDIncreasingCheck = FALSE;
+       objid_query.oid_increasing_check = TRUE;

        if (session_less_mode) {
                if (version == SNMP_VERSION_3) {
@@ -1426,7 +1426,7 @@
                                objid_query.max_repetitions = 
snmp_object->max_oids;
                        }
                }
-               objid_query.noOIDIncreasingCheck = 
snmp_object->noOIDIncreasingCheck;
+               objid_query.oid_increasing_check = 
snmp_object->oid_increasing_check;
                objid_query.valueretrieval = snmp_object->valueretrieval;
                glob_snmp_object.enum_print = 
netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, 
NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM);
                netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, 
NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM, snmp_object->enum_print);
@@ -1757,6 +1757,7 @@
        snmp_object->enum_print = netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, 
NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM);
        snmp_object->oid_output_format = 
netsnmp_ds_get_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT);
        snmp_object->quick_print = 
netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT);
+       snmp_object->oid_increasing_check = TRUE;
 }
 /* }}} */

@@ -2118,7 +2119,7 @@
                return SUCCESS; \
        }

-PHP_SNMP_BOOL_PROPERTY_READER_FUNCTION(noOIDIncreasingCheck)
+PHP_SNMP_BOOL_PROPERTY_READER_FUNCTION(oid_increasing_check)
 PHP_SNMP_BOOL_PROPERTY_READER_FUNCTION(quick_print)
 PHP_SNMP_BOOL_PROPERTY_READER_FUNCTION(enum_print)

@@ -2222,7 +2223,7 @@

 PHP_SNMP_BOOL_PROPERTY_WRITER_FUNCTION(quick_print)
 PHP_SNMP_BOOL_PROPERTY_WRITER_FUNCTION(enum_print)
-PHP_SNMP_BOOL_PROPERTY_WRITER_FUNCTION(noOIDIncreasingCheck)
+PHP_SNMP_BOOL_PROPERTY_WRITER_FUNCTION(oid_increasing_check)

 /* {{{ */
 static int php_snmp_write_oid_output_format(php_snmp_object *snmp_object, zval 
*newval TSRMLS_DC)
@@ -2284,7 +2285,7 @@
        PHP_SNMP_PROPERTY_ENTRY_RECORD(quick_print),
        PHP_SNMP_PROPERTY_ENTRY_RECORD(enum_print),
        PHP_SNMP_PROPERTY_ENTRY_RECORD(oid_output_format),
-       PHP_SNMP_PROPERTY_ENTRY_RECORD(noOIDIncreasingCheck),
+       PHP_SNMP_PROPERTY_ENTRY_RECORD(oid_increasing_check),
        { NULL, 0, NULL, NULL}
 };
 /* }}} */

Modified: php/php-src/trunk/ext/snmp/tests/snmp-object-properties.phpt
===================================================================
--- php/php-src/trunk/ext/snmp/tests/snmp-object-properties.phpt        
2011-07-21 12:27:00 UTC (rev 313531)
+++ php/php-src/trunk/ext/snmp/tests/snmp-object-properties.phpt        
2011-07-21 12:47:07 UTC (rev 313532)
@@ -26,7 +26,7 @@
 $session->quick_print = TRUE;
 $session->valueretrieval = SNMP_VALUE_LIBRARY;
 $session->oid_output_format = SNMP_OID_OUTPUT_NUMERIC;
-$session->noOIDIncreasingCheck = TRUE;
+$session->oid_increasing_check = FALSE;

 var_dump($session);

@@ -35,7 +35,7 @@
 $session->quick_print = "1";
 $session->valueretrieval = "1";
 $session->oid_output_format = "3";
-$session->noOIDIncreasingCheck = "45";
+$session->oid_increasing_check = "45";

 var_dump($session);

@@ -89,8 +89,8 @@
   bool(false)
   ["oid_output_format"]=>
   int(3)
-  ["noOIDIncreasingCheck"]=>
-  bool(false)
+  ["oid_increasing_check"]=>
+  bool(true)
 }
 object(SNMP)#%d (%d) {
   ["info"]=>
@@ -114,8 +114,8 @@
   bool(true)
   ["oid_output_format"]=>
   int(4)
-  ["noOIDIncreasingCheck"]=>
-  bool(true)
+  ["oid_increasing_check"]=>
+  bool(false)
 }
 object(SNMP)#%d (%d) {
   ["info"]=>
@@ -139,7 +139,7 @@
   bool(true)
   ["oid_output_format"]=>
   int(3)
-  ["noOIDIncreasingCheck"]=>
+  ["oid_increasing_check"]=>
   bool(true)
 }
 bool(true)
@@ -167,7 +167,7 @@
   bool(true)
   ["oid_output_format"]=>
   int(3)
-  ["noOIDIncreasingCheck"]=>
+  ["oid_increasing_check"]=>
   bool(true)
   ["123"]=>
   string(11) "param_value"

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to