Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 02:55:12 +00:00
Code Issues Releases Activity

Compilation fix for weather stuff.

Browse Source
This commit is contained in:
Brenden Matthews 2009-08-03 12:48:52 -06:00
parent 05330f24a3
commit 63229dac63
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conky.c
View File

@ -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); argc = sscanf(arg, "%119s %8s %31s %f", uri, locID, data_type, &interval);
if (argc >= 3) { if (argc >= 3) {
if (process_weather_uri(uri, locID, 0)) { if (process_weather_uri(uri, locID)) {
free(data_type); free(data_type);
free(uri); free(uri);
free(locID); 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); argc = sscanf(arg, "%119s %8s %1u %31s %f", uri, locID, &day, data_type, &interval);
if (argc >= 4) { if (argc >= 4) {
if (process_weather_uri(uri, locID, 1)) { if (process_weather_uri(uri, locID)) {
free(data_type); free(data_type);
free(uri); free(uri);
free(locID); free(locID);

4
src/weather.c
View File

@ -781,7 +781,7 @@ void load_xoap_keys(void)
} }
#endif /* XOAP */ #endif /* XOAP */
int process_weather_uri(char *uri, char *locID, int dayf) int process_weather_uri(char *uri, char *locID)
{ {
/* locID MUST BE upper-case */ /* locID MUST BE upper-case */
char *tmp_p = locID; char *tmp_p = locID;
@ -803,7 +803,7 @@ int process_weather_uri(char *uri, char *locID, int dayf)
free(uri); free(uri);
uri = NULL; uri = NULL;
} }
} else } else
#endif /* XOAP */ #endif /* XOAP */
if (strstr(uri, "weather.noaa.gov")) { if (strstr(uri, "weather.noaa.gov")) {
strcat(uri, locID); strcat(uri, locID);

2
src/weather.h
View File

@ -69,7 +69,7 @@ void weather_process_info(char *p, int p_max_size, char *uri, char *data_type, i
#ifdef XOAP #ifdef XOAP
void weather_forecast_process_info(char *p, int p_max_size, char *uri, unsigned int day, char *data_type, int interval); void weather_forecast_process_info(char *p, int p_max_size, char *uri, unsigned int day, char *data_type, int interval);
#endif /* XOAP */ #endif /* XOAP */
int process_weather_uri(char *uri, char *locID, int dayf); int process_weather_uri(char *uri, char *locID);
#ifdef XOAP #ifdef XOAP
void load_xoap_keys(void); void load_xoap_keys(void);