Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-05 21:07:52 +00:00
Code Issues Releases Activity

Revert "Compilation fix for weather stuff."

Browse Source 
This reverts commit 63229dac63.
This commit is contained in:
Brenden Matthews 2009-08-03 12:52:10 -06:00
parent 63229dac63
commit aa142b0941
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);
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);

4
src/weather.c
View File

@ -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);

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
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);