Extend commit 25680305095bfcedaa46cb017182544183ab743b to the whole cpu object.

[monky] / src / weather.h

diff --git a/src/weather.h b/src/weather.h
index d70ec19..166e3ae 100644 (file)
--- a/src/weather.h
+++ b/src/weather.h
@@ -9,7 +9,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *
@@ -30,50 +30,17 @@
 #ifndef WEATHER_H_
 #define WEATHER_H_
 
-#include "config.h"
-
-/* WEATHER data */
-typedef struct PWEATHER_ {
-       char lastupd[32];
-#ifdef XOAP
-       char xoap_t[32];
-       char icon[3];
-#endif /* XOAP */
-       int temp;
-       int dew;
-       int cc;
-       int bar;
-       int wind_s;
-       int wind_d;
-       int hmid;
-       int wc;
-} PWEATHER;
-
-#ifdef XOAP
-#define FORECAST_DAYS 5
-typedef struct PWEATHER_FORECAST_ {
-       int hi[FORECAST_DAYS];
-       int low[FORECAST_DAYS];
-       char icon[FORECAST_DAYS][3];
-       char xoap_t[FORECAST_DAYS][32];
-       int wind_s[FORECAST_DAYS];
-       int wind_d[FORECAST_DAYS];
-       int hmid[FORECAST_DAYS];
-       int ppcp[FORECAST_DAYS];
-} PWEATHER_FORECAST;
-#endif /* XOAP */
-
 /* Prototypes */
 void weather_free_info(void);
-void weather_process_info(char *p, int p_max_size, char *uri, char *data_type, int interval);
-#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 dayf);
 
 #ifdef XOAP
 void load_xoap_keys(void);
+void scan_weather_forecast_arg(struct text_object *, const char *, void *);
+void print_weather_forecast(struct text_object *, char *, int);
 #endif /* XOAP */
 
+void scan_weather_arg(struct text_object *, const char *, void *);
+void print_weather(struct text_object *, char *, int);
+void free_weather(struct text_object *);
 
 #endif /*WEATHER_H_*/