osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Constify the "string to return if not found" argument to 

geoip_db_lookup_ipv4() and geoip_db_lookup_ipv6().

In both of those routines, "ret" is always set to a non-null value -
it's initially set to the aforementioned string - so always return it.

svn path=/trunk/; revision=43526
This commit is contained in:
Guy Harris 2012-06-28 18:43:16 +00:00
parent 79e11663b1
commit fbc8de6048
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epan/geoip_db.c
View File

@ -269,7 +269,7 @@ iso_8859_1_to_utf_8(char *val) {
} }
const char * const char *
geoip_db_lookup_ipv4(guint dbnum, guint32 addr, char *not_found) { geoip_db_lookup_ipv4(guint dbnum, guint32 addr, const char *not_found) {
GeoIP *gi; GeoIP *gi;
GeoIPRecord *gir; GeoIPRecord *gir;
const char *raw_val, *ret = not_found; const char *raw_val, *ret = not_found;
@ -344,11 +344,8 @@ geoip_db_lookup_ipv4(guint dbnum, guint32 addr, char *not_found) {
break; break;
} }
} }
if (ret) {
return ret; return ret;
} }
return not_found;
}
#ifdef HAVE_GEOIP_V6 #ifdef HAVE_GEOIP_V6
@ -388,7 +385,7 @@ geoip_db_lookup_latlon6(geoipv6_t addr _U_, float *lat _U_, float *lon _U_) {
#endif /* NUM_DB_TYPES */ #endif /* NUM_DB_TYPES */
const char * const char *
geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, char *not_found) { geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, const char *not_found) {
GeoIP *gi; GeoIP *gi;
geoipv6_t gaddr; geoipv6_t gaddr;
const char *raw_val, *ret = not_found; const char *raw_val, *ret = not_found;
@ -470,16 +467,13 @@ geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, char *not_found) {
break; break;
} }
} }
if (ret) {
return ret; return ret;
} }
return not_found;
}
#else /* HAVE_GEOIP_V6 */ #else /* HAVE_GEOIP_V6 */
const char * const char *
geoip_db_lookup_ipv6(guint dbnum _U_, struct e_in6_addr addr _U_, char *not_found) { geoip_db_lookup_ipv6(guint dbnum _U_, struct e_in6_addr addr _U_, const char *not_found) {
return not_found; return not_found;
} }
@ -532,12 +526,12 @@ geoip_db_type(guint dbnum _U_) {
} }
const char * const char *
geoip_db_lookup_ipv4(guint dbnum _U_, guint32 addr _U_, char *not_found) { geoip_db_lookup_ipv4(guint dbnum _U_, guint32 addr _U_, const char *not_found) {
return not_found; return not_found;
} }
const char * const char *
geoip_db_lookup_ipv6(guint dbnum _U_, guint32 addr _U_, char *not_found) { geoip_db_lookup_ipv6(guint dbnum _U_, guint32 addr _U_, const char *not_found) {
return not_found; return not_found;
} }

4
epan/geoip_db.h
View File

@ -71,7 +71,7 @@ extern int geoip_db_type(guint dbnum);
* @param not_found The string to return if the lookup fails. May be NULL. * @param not_found The string to return if the lookup fails. May be NULL.
* @return The database entry if found, else not_found * @return The database entry if found, else not_found
*/ */
extern const char *geoip_db_lookup_ipv4(guint dbnum, guint32 addr, char *not_found); extern const char *geoip_db_lookup_ipv4(guint dbnum, guint32 addr, const char *not_found);
/** /**
* Look up an IPv6 address in a database * Look up an IPv6 address in a database
@ -81,7 +81,7 @@ extern const char *geoip_db_lookup_ipv4(guint dbnum, guint32 addr, char *not_fou
* @param not_found The string to return if the lookup fails. May be NULL. * @param not_found The string to return if the lookup fails. May be NULL.
* @return The database entry if found, else not_found * @return The database entry if found, else not_found
*/ */
extern const char *geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, char *not_found); extern const char *geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, const char *not_found);
/** /**
* Get all configured paths * Get all configured paths