From 4139ec096f3d503b6b7f071049bf596917223521 Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Sun, 19 Jul 2009 12:12:42 -0600 Subject: [PATCH] Code formatting. --- src/weather.c | 190 +++++++++++++++++++++++++------------------------- src/weather.h | 36 +++++----- 2 files changed, 113 insertions(+), 113 deletions(-) diff --git a/src/weather.c b/src/weather.c index 737c33c5..7c3380c4 100644 --- a/src/weather.c +++ b/src/weather.c @@ -133,69 +133,69 @@ int rel_humidity(int dew_point, int air) { static void parse_cc(PWEATHER *res, xmlNodePtr cc) { - xmlNodePtr cur = NULL; + xmlNodePtr cur = NULL; - for (cur = cc; cur; cur = cur->next) { - if (cur->type == XML_ELEMENT_NODE) { - if (!xmlStrcmp(cur->name, (const xmlChar *) "lsup")) { - strncpy(res->lastupd, (char *)cur->children->content, 31); - } else if (!xmlStrcmp(cur->name, (const xmlChar *) "tmp")) { - res->temp = atoi((char *)cur->children->content); - } else if (!xmlStrcmp(cur->name, (const xmlChar *) "t")) { - if(res->xoap_t[0] == '\0') { - strncpy(res->xoap_t, (char *)cur->children->content, 31); + for (cur = cc; cur; cur = cur->next) { + if (cur->type == XML_ELEMENT_NODE) { + if (!xmlStrcmp(cur->name, (const xmlChar *) "lsup")) { + strncpy(res->lastupd, (char *)cur->children->content, 31); + } else if (!xmlStrcmp(cur->name, (const xmlChar *) "tmp")) { + res->temp = atoi((char *)cur->children->content); + } else if (!xmlStrcmp(cur->name, (const xmlChar *) "t")) { + if(res->xoap_t[0] == '\0') { + strncpy(res->xoap_t, (char *)cur->children->content, 31); + } + } else if (!xmlStrcmp(cur->name, (const xmlChar *) "r")) { + res->bar = atoi((char *)cur->children->content); + } else if (!xmlStrcmp(cur->name, (const xmlChar *) "s")) { + res->wind_s = atoi((char *)cur->children->content); + } else if (!xmlStrcmp(cur->name, (const xmlChar *) "d")) { + if (isdigit((char)cur->children->content[0])) { + res->wind_d = atoi((char *)cur->children->content); + } + } else if (!xmlStrcmp(cur->name, (const xmlChar *) "hmid")) { + res->hmid = atoi((char *)cur->children->content); + } + } + parse_cc(res, cur->children); } - } else if (!xmlStrcmp(cur->name, (const xmlChar *) "r")) { - res->bar = atoi((char *)cur->children->content); - } else if (!xmlStrcmp(cur->name, (const xmlChar *) "s")) { - res->wind_s = atoi((char *)cur->children->content); - } else if (!xmlStrcmp(cur->name, (const xmlChar *) "d")) { - if (isdigit((char)cur->children->content[0])) { - res->wind_d = atoi((char *)cur->children->content); - } - } else if (!xmlStrcmp(cur->name, (const xmlChar *) "hmid")) { - res->hmid = atoi((char *)cur->children->content); - } - } - parse_cc(res, cur->children); - } - return; + return; } static void parse_weather_xml(PWEATHER *res, const char *data) { - xmlDocPtr doc; - xmlNodePtr cur; + xmlDocPtr doc; + xmlNodePtr cur; - if (!(doc = xmlReadMemory(data, strlen(data), "", NULL, 0))) { - ERR("weather: can't read xml data"); - return; - } - - cur = xmlDocGetRootElement(doc); - - while(cur) { - if (cur->type == XML_ELEMENT_NODE) { - if (!xmlStrcmp(cur->name, (const xmlChar *) "weather")) { - cur = cur->children; - while (cur != NULL) { - if (cur->type == XML_ELEMENT_NODE) { - if (!xmlStrcmp(cur->name, (const xmlChar *) "cc")) { - parse_cc(res, cur->children); - xmlFreeDoc(doc); - return; - } - } - cur = cur->next; + if (!(doc = xmlReadMemory(data, strlen(data), "", NULL, 0))) { + ERR("weather: can't read xml data"); + return; } - } - } - cur = cur->next; - } - ERR("weather: incorrect xml data"); - xmlFreeDoc(doc); - return ; + cur = xmlDocGetRootElement(doc); + + while(cur) { + if (cur->type == XML_ELEMENT_NODE) { + if (!xmlStrcmp(cur->name, (const xmlChar *) "weather")) { + cur = cur->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if (!xmlStrcmp(cur->name, (const xmlChar *) "cc")) { + parse_cc(res, cur->children); + xmlFreeDoc(doc); + return; + } + } + cur = cur->next; + } + } + } + cur = cur->next; + } + + ERR("weather: incorrect xml data"); + xmlFreeDoc(doc); + return ; } #endif /* XOAP */ @@ -491,45 +491,45 @@ static inline void parse_token(PWEATHER *res, char *token) { static void parse_weather(PWEATHER *res, const char *data) { - //Reset results + //Reset results memset(res, 0, sizeof(PWEATHER)); #ifdef XOAP //Check if it is an xml file if ( strncmp(data, "lastupd, s_tmp) == 2) { + //Divide time stamp and metar data + if (sscanf(data, "%[^'\n']\n%[^'\n']", res->lastupd, s_tmp) == 2) { - //Process all tokens - char *p_tok = NULL; - char *p_save = NULL; + //Process all tokens + char *p_tok = NULL; + char *p_save = NULL; - if ((strtok_r(s_tmp, delim, &p_save)) != NULL) { + if ((strtok_r(s_tmp, delim, &p_save)) != NULL) { - //Jump first token, must be icao - p_tok = strtok_r(NULL, delim, &p_save); + //Jump first token, must be icao + p_tok = strtok_r(NULL, delim, &p_save); - do { + do { - parse_token(res, p_tok); - p_tok = strtok_r(NULL, delim, &p_save); + parse_token(res, p_tok); + p_tok = strtok_r(NULL, delim, &p_save); - } while (p_tok != NULL); - } - return; - } - else { - return; - } - } + } while (p_tok != NULL); + } + return; + } + else { + return; + } + } } void fetch_weather_info(location *curloc) @@ -604,25 +604,25 @@ void process_weather_info(char *p, int p_max_size, char *uri, char *data_type, i temp_print(p, p_max_size, curloc->data.temp, TEMP_CELSIUS); } else if (strcmp(data_type, "cloud_cover") == EQUAL) { #ifdef XOAP - if (curloc->data.xoap_t[0] != '\0') { + if (curloc->data.xoap_t[0] != '\0') { strncpy(p, curloc->data.xoap_t, p_max_size); } else #endif /* XOAP */ - if (curloc->data.cc == 0) { - strncpy(p, "", p_max_size); - } else if (curloc->data.cc < 3) { - strncpy(p, "clear", p_max_size); - } else if (curloc->data.cc < 5) { - strncpy(p, "partly cloudy", p_max_size); - } else if (curloc->data.cc == 5) { - strncpy(p, "cloudy", p_max_size); - } else if (curloc->data.cc == 6) { - strncpy(p, "overcast", p_max_size); - } else if (curloc->data.cc == 7) { - strncpy(p, "towering cumulus", p_max_size); - } else { - strncpy(p, "cumulonimbus", p_max_size); - } + if (curloc->data.cc == 0) { + strncpy(p, "", p_max_size); + } else if (curloc->data.cc < 3) { + strncpy(p, "clear", p_max_size); + } else if (curloc->data.cc < 5) { + strncpy(p, "partly cloudy", p_max_size); + } else if (curloc->data.cc == 5) { + strncpy(p, "cloudy", p_max_size); + } else if (curloc->data.cc == 6) { + strncpy(p, "overcast", p_max_size); + } else if (curloc->data.cc == 7) { + strncpy(p, "towering cumulus", p_max_size); + } else { + strncpy(p, "cumulonimbus", p_max_size); + } } else if (strcmp(data_type, "pressure") == EQUAL) { snprintf(p, p_max_size, "%d", curloc->data.bar); } else if (strcmp(data_type, "wind_speed") == EQUAL) { diff --git a/src/weather.h b/src/weather.h index 70dd4e9e..bff17c5e 100644 --- a/src/weather.h +++ b/src/weather.h @@ -30,28 +30,28 @@ /* WEATHER data */ typedef struct PWEATHER_ { - char lastupd[32]; + char lastupd[32]; #ifdef XOAP - char xoap_t[32]; - /* - * TODO: - * Is it worth investigating about using icons from weather.com? - * We could use them for data from noaa as well. - * They can display nicely with cimlib_add_image (with appropriate - * #ifdefs on imlib2 and x11), and an additional input argoment for position. + char xoap_t[32]; + /* + * TODO: + * Is it worth investigating about using icons from weather.com? + * We could use them for data from noaa as well. + * They can display nicely with cimlib_add_image (with appropriate + * #ifdefs on imlib2 and x11), and an additional input argoment for position. - char icon[3]; + char icon[3]; - */ + */ #endif /* XOAP */ - int temp; - int dew; - int cc; - int bar; - int wind_s; - int wind_d; - int hmid; - int wc; + int temp; + int dew; + int cc; + int bar; + int wind_s; + int wind_d; + int hmid; + int wc; } PWEATHER; /* Prototypes */