File GeoIP-1.4.5.diff of Package GeoIP
---------------------
PatchSet 277
Date: 2008/09/18 18:52:30
Author: borisz
Branch: HEAD
Tag: (none)
Log:
avoid pre/postincrement and assignment on the same variable
Index: c/libGeoIP/GeoIP.c
diff -u c/libGeoIP/GeoIP.c:1.86 c/libGeoIP/GeoIP.c:1.87
--- c/libGeoIP/GeoIP.c:1.86 Tue Sep 16 15:16:20 2008
+++ c/libGeoIP/GeoIP.c Thu Sep 18 16:52:31 2008
@@ -1388,7 +1388,7 @@
/* Go to beginning of netblock defined by netmask */
mask = 0xffffffff << ( 32 - GeoIP_last_netmask(gi) );
- left_seek = --left_seek & mask;
+ left_seek = ( left_seek - 1 ) & mask;
}
ret[0] = _GeoIP_num_to_addr(gi, left_seek);
@@ -1397,7 +1397,7 @@
/* Go to end of netblock defined by netmask */
mask = 0xffffffff << ( 32 - GeoIP_last_netmask(gi) );
- right_seek = ++right_seek & mask;
+ right_seek = ( right_seek + 1 ) & mask;
right_seek += 0xffffffff & ~mask;
}
ret[1] = _GeoIP_num_to_addr(gi, right_seek);
# vim: syntax=diff