diff options
Diffstat (limited to 'src/pj_init.c')
| -rw-r--r-- | src/pj_init.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/pj_init.c b/src/pj_init.c index e5b1441a..29368cbd 100644 --- a/src/pj_init.c +++ b/src/pj_init.c @@ -126,7 +126,7 @@ static char *get_init_string (PJ_CONTEXT *ctx, char *name) { *section = 0; section++; n = strlen (section); - pj_log (ctx, 3, "get_init_string: searching for section [%s] in init file [%s]\n", section, fname); + pj_log (ctx, 3, "get_init_string: searching for section [%s] in init file [%s]", section, fname); fid = pj_open_lib (ctx, fname, "rt"); if (0==fid) { @@ -216,7 +216,7 @@ static char *get_init_string (PJ_CONTEXT *ctx, char *name) { if (0==buffer) return 0; pj_shrink (buffer); - pj_log (ctx, 3, "key=%s, value: [%s]\n", key, buffer); + pj_log (ctx, 3, "key=%s, value: [%s]", key, buffer); return buffer; } @@ -236,7 +236,7 @@ Expand key from buffer or (if not in buffer) from init file xkey = key; else xkey += 5; - pj_log (ctx, 3, "get_init: searching cache for key: [%s]\n", xkey); + pj_log (ctx, 3, "get_init: searching cache for key: [%s]", xkey); /* Is file/key pair already in cache? */ init_items = pj_search_initcache (xkey); @@ -244,13 +244,13 @@ Expand key from buffer or (if not in buffer) from init file return init_items; /* If not, we must read it from file */ - pj_log (ctx, 3, "get_init: searching on in init files for [%s]\n", xkey); + pj_log (ctx, 3, "get_init: searching on in init files for [%s]", xkey); definition = get_init_string (ctx, xkey); if (0==definition) return 0; init_items = string_to_paralist (ctx, definition); if (init_items) - pj_log (ctx, 3, "get_init: got [%s], paralist[0,1]: [%s,%s]\n", definition, init_items->param, init_items->next? init_items->next->param: "(empty)"); + pj_log (ctx, 3, "get_init: got [%s], paralist[0,1]: [%s,%s]", definition, init_items->param, init_items->next? init_items->next->param: "(empty)"); pj_dealloc (definition); if (0==init_items) return 0; @@ -593,9 +593,10 @@ pj_init_ctx(projCtx ctx, int argc, char **argv) { /* Set datum parameters. Similarly to +init parameters we want to expand */ /* +datum parameters as late as possible when dealing with pipelines. */ /* otherwise only the first occurrence of +datum will be expanded and that */ - if (n_pipelines == 0) + if (n_pipelines == 0) { if (pj_datum_set(ctx, start, PIN)) return pj_default_destructor (PIN, proj_errno(PIN)); + } err = pj_ellipsoid (PIN); |