Revert "Compilation fix for weather stuff."

This reverts commit 63229dac638d3f67d83c829106632a758d0eded7.

diff --git a/src/conky.c b/src/conky.c
index e7a9f9a..d26cb78 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -3018,7 +3018,7 @@ static struct text_object *construct_text_object(const char *s,
                        argc = sscanf(arg, "%119s %8s %31s %f", uri, locID, data_type, &interval);
 
                        if (argc >= 3) {
-                               if (process_weather_uri(uri, locID)) {
+                               if (process_weather_uri(uri, locID, 0)) {
                                        free(data_type);
                                        free(uri);
                                        free(locID);
@@ -3063,7 +3063,7 @@ static struct text_object *construct_text_object(const char *s,
                        argc = sscanf(arg, "%119s %8s %1u %31s %f", uri, locID, &day, data_type, &interval);
 
                        if (argc >= 4) {
-                               if (process_weather_uri(uri, locID)) {
+                               if (process_weather_uri(uri, locID, 1)) {
                                        free(data_type);
                                        free(uri);
                                        free(locID);

diff --git a/src/weather.c b/src/weather.c
index 94612e2..671d526 100644 (file)
--- a/src/weather.c
+++ b/src/weather.c
@@ -781,7 +781,7 @@ void load_xoap_keys(void)
 }
 #endif /* XOAP */
 
-int process_weather_uri(char *uri, char *locID)
+int process_weather_uri(char *uri, char *locID, int dayf)
 {
        /* locID MUST BE upper-case */
        char *tmp_p = locID;
@@ -803,7 +803,7 @@ int process_weather_uri(char *uri, char *locID)
                        free(uri);
                        uri = NULL;
                }
-       } else
+       } else 
 #endif /* XOAP */
        if (strstr(uri, "weather.noaa.gov")) {
                strcat(uri, locID);

diff --git a/src/weather.h b/src/weather.h
index 2511249..d70ec19 100644 (file)
--- a/src/weather.h
+++ b/src/weather.h
@@ -69,7 +69,7 @@ void weather_process_info(char *p, int p_max_size, char *uri, char *data_type, i
 #ifdef XOAP
 void weather_forecast_process_info(char *p, int p_max_size, char *uri, unsigned int day, char *data_type, int interval);
 #endif /* XOAP */
-int process_weather_uri(char *uri, char *locID);
+int process_weather_uri(char *uri, char *locID, int dayf);
 
 #ifdef XOAP
 void load_xoap_keys(void);