stv0g/calcelestial
1
0
Fork 0
Code Issues 5 Pull requests Releases Wiki Activity

improved debugging and error output

Browse source
This commit is contained in:
Steffen Vogel 2016-10-26 19:12:54 -04:00
parent 0eb03a153b
commit 7fadcacf6a
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/calcelestial.c
View file

@ -283,12 +283,12 @@ int main(int argc, char *argv[]) {
result.obs = obs;
#ifdef DEBUG
printf("calculate for jd: %f\n", jd);
printf("calculate for ts: %ld\n", t);
printf("for position: N %f, E %f\n", obs.lat, obs.lng);
printf("for object: %s\n", object_to_name(obj));
printf("with horizon: %f\n", horizon);
printf("with timezone: %d\n", result.tz);
printf("debug: calculate for jd: %f\n", jd);
printf("debug: calculate for ts: %ld\n", t);
printf("debug: for position: N %f, E %f\n", obs.lat, obs.lng);
printf("debug: for object: %s\n", object_to_name(obj));
printf("debug: with horizon: %f\n", horizon);
printf("debug: with timezone: %d\n", result.tz);
#endif
/* calc rst date */

13
src/geonames.c
View file

@ -50,8 +50,8 @@ static size_t json_parse_callback(void *contents, size_t size, size_t nmemb, voi
if (jtok->err == json_tokener_continue) {
#ifdef DEBUG
printf("got chunk: %zu * %zu = %zu bytes\r\n", size, nmemb, realsize);
printf(" %.*s\r\n", realsize, (char *) contents);
printf("debug: received chunk: %zu * %zu = %zu bytes\r\n", size, nmemb, realsize);
printf(" %.*s\r\n", (int) realsize, (char *) contents);
#endif
jobj = json_tokener_parse_ex(jtok, (char *) contents, realsize);
@ -61,7 +61,8 @@ static size_t json_parse_callback(void *contents, size_t size, size_t nmemb, voi
json_tokener_free(jtok);
}
else if (jtok->err != json_tokener_continue) {
fprintf(stderr, "parse error: %\r\n", json_tokener_get_error(jtok));
const char *err = json_tokener_error_desc(json_tokener_get_error(jtok));
fprintf(stderr, "json parse error: %s\r\n", err);
*(void **) userp = NULL;
json_tokener_free(jtok);
}
@ -75,7 +76,7 @@ int geonames_lookup(const char *place, struct ln_lnlat_posn *result, char *name,
#ifdef GEONAMES_CACHE_SUPPORT
if (geonames_cache_lookup(place, result, name, n) == 0) {
#ifdef DEBUG
printf("using cached geonames entry\n");
printf("debug: using cached geonames entry\n");
#endif
return 0;
}
@ -100,7 +101,7 @@ int geonames_lookup(const char *place, struct ln_lnlat_posn *result, char *name,
snprintf(request_url, len, request_url_tpl, place, username);
#ifdef DEBUG
printf("request url: %s\r\n", request_url);
printf("debug: request url: %s\r\n", request_url);
#endif
curl_easy_setopt(ch, CURLOPT_URL, request_url);
@ -125,7 +126,7 @@ int geonames_lookup(const char *place, struct ln_lnlat_posn *result, char *name,
#ifdef GEONAMES_CACHE_SUPPORT
geonames_cache_store(place, result, name, n);
#ifdef DEBUG
printf("storing cache entry\n");
printf("debug: storing cache entry\n");
#endif
#endif
}