[geocode-glib] ip-server: Use switch statement to print error messages
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geocode-glib] ip-server: Use switch statement to print error messages
- Date: Wed, 19 Jun 2013 15:32:05 +0000 (UTC)
commit 7b257c6b9d6b5206bcfc11a36b5b41cb9384b908
Author: Bastien Nocera <hadess hadess net>
Date: Wed Jun 19 17:15:54 2013 +0200
ip-server: Use switch statement to print error messages
geocode-glib/geocode-ip-server/geoip-lookup.c | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/geocode-glib/geocode-ip-server/geoip-lookup.c b/geocode-glib/geocode-ip-server/geoip-lookup.c
index 0fa0a5f..22bf59b 100644
--- a/geocode-glib/geocode-ip-server/geoip-lookup.c
+++ b/geocode-glib/geocode-ip-server/geoip-lookup.c
@@ -13,21 +13,26 @@
static const char *attribution_text = "This product includes GeoLite data created by MaxMind, available from
http://www.maxmind.com";
-static char *error_message_array [] = {
- "Invalid IP address '%s'",
- "Can not find the IP address '%s' in the database",
- "Can not open GeoLiteCity/GeoIP Binary database. Set GEOIP_DATABASE_PATH env variable."
-};
-
static void
print_error_in_json (GeoipServerError error_code,
const char *extra_info)
{
g_print ("{\"error_code\":%d, \"error_message\":\"", error_code);
- if (extra_info)
- g_print (error_message_array[error_code], extra_info);
- else
- g_print (error_message_array[error_code]);
+
+ switch (error_code) {
+ case INVALID_IP_ADDRESS_ERR:
+ g_print ("Invalid IP address '%s'", extra_info ? extra_info : "(none)");
+ break;
+ case INVALID_ENTRY_ERR:
+ g_print ("Can not find the IP address '%s' in the database", extra_info);
+ break;
+ case DATABASE_ERR:
+ g_print ("Can not open GeoLiteCity/GeoIP Binary database. Set GEOIP_DATABASE_PATH env
variable.");
+ break;
+ default:
+ g_assert_not_reached ();
+ }
+
g_print ("\"}\n");
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]