Commit a81e0b7e authored by Jussi Kukkonen's avatar Jussi Kukkonen

fix varargs calls to gc_web_service_query()

Apparently using NULL to end varargs argument list does not work on
e.g. 64 bit platforms
parent a9d07a48
......@@ -37,7 +37,7 @@
* if (!gc_web_service_query (web_service,
* "key1", "val1"
* "key2", val2"
* NULL)) {
* (char *)0)) {
* / * error * /
* return;
* }
......
......@@ -118,7 +118,7 @@ geoclue_geonames_address_to_position (GcIfaceGeocode *iface,
"country", countrycode,
"maxRows", "1",
"style", "FULL",
NULL)) {
(char *)0)) {
g_set_error (error, GEOCLUE_ERROR,
GEOCLUE_ERROR_NOT_AVAILABLE, "Web service query failed");
return FALSE;
......@@ -138,7 +138,7 @@ geoclue_geonames_address_to_position (GcIfaceGeocode *iface,
"country", countrycode,
"maxRows", "1",
"style", "FULL",
NULL)) {
(char *)0)) {
g_set_error (error, GEOCLUE_ERROR,
GEOCLUE_ERROR_NOT_AVAILABLE, "Web service query failed");
return FALSE;
......@@ -191,7 +191,7 @@ geoclue_geonames_position_to_address (GcIfaceReverseGeocode *iface,
"featureCode","PPLS",
"maxRows", "1",
"style", "FULL",
NULL)) {
(char *)0)) {
g_set_error (error, GEOCLUE_ERROR,
GEOCLUE_ERROR_NOT_AVAILABLE, "Web service query failed");
return FALSE;
......
......@@ -205,7 +205,7 @@ geoclue_gsmloc_get_position (GcIfacePosition *iface,
"nid2", mnc,
"lac", lac,
"cid", cid,
NULL)) {
(char *)0)) {
g_set_error (error, GEOCLUE_ERROR,
GEOCLUE_ERROR_NOT_AVAILABLE,
"Web service query failed");
......
......@@ -81,7 +81,7 @@ geoclue_hostip_get_position (GcIfacePosition *iface,
*fields = GEOCLUE_POSITION_FIELDS_NONE;
if (!gc_web_service_query (obj->web_service, NULL)) {
if (!gc_web_service_query (obj->web_service, (char *)0)) {
g_set_error (error, GEOCLUE_ERROR,
GEOCLUE_ERROR_NOT_AVAILABLE, "Web service query failed");
return FALSE;
......@@ -123,7 +123,7 @@ geoclue_hostip_get_address (GcIfaceAddress *iface,
gchar *country = NULL;
gchar *country_code = NULL;
if (!gc_web_service_query (obj->web_service, NULL)) {
if (!gc_web_service_query (obj->web_service, (char *)0)) {
g_set_error (error, GEOCLUE_ERROR,
GEOCLUE_ERROR_NOT_AVAILABLE, "Web service query failed");
return FALSE;
......
......@@ -146,7 +146,8 @@ geoclue_plazes_get_position (GcIfacePosition *iface,
}
if (!gc_web_service_query (plazes->web_service,
PLAZES_KEY_MAC, mac, NULL)) {
PLAZES_KEY_MAC, mac,
(char *)0)) {
g_set_error (error, GEOCLUE_ERROR,
GEOCLUE_ERROR_NOT_AVAILABLE,
"Web service query failed");
......@@ -207,7 +208,8 @@ geoclue_plazes_get_address (GcIfaceAddress *iface,
}
if (!gc_web_service_query (plazes->web_service,
PLAZES_KEY_MAC, mac, NULL)) {
PLAZES_KEY_MAC, mac,
(char *)0)) {
g_set_error (error, GEOCLUE_ERROR,
GEOCLUE_ERROR_NOT_AVAILABLE,
"Web service query failed");
......
......@@ -107,7 +107,7 @@ geoclue_yahoo_address_to_position (GcIfaceGeocode *iface,
"zip", postalcode,
"city", locality,
"state", region,
NULL)) {
(char *)0)) {
g_set_error (error, GEOCLUE_ERROR,
GEOCLUE_ERROR_NOT_AVAILABLE, "Web service query failed");
return FALSE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment