Stefan Schuermans commited on 2016-12-21 09:47:41
Showing 1 changed files, with 11 additions and 11 deletions.
... | ... |
@@ -43,7 +43,7 @@ |
43 | 43 |
* \return 0 in case of success, -1 in case of error |
44 | 44 |
*/ |
45 | 45 |
int flp_config_proc_distri(flp_config_ctx_t *p_ctx, char *p_setting_part2, |
46 |
- char *value) |
|
46 |
+ char *p_value) |
|
47 | 47 |
{ |
48 | 48 |
char *ptr; |
49 | 49 |
unsigned long val; |
... | ... |
@@ -63,12 +63,12 @@ int flp_config_proc_distri(flp_config_ctx_t *p_ctx, char *p_setting_part2, |
63 | 63 |
distri = (unsigned int)val; |
64 | 64 |
|
65 | 65 |
/* get number of outputs and pixels */ |
66 |
- if (flp_parse_two_nos(value, &out, &pix, &ptr) || *ptr != 0) { |
|
66 |
+ if (flp_parse_two_nos(p_value, &out, &pix, &ptr) || *ptr != 0) { |
|
67 | 67 |
if (p_ctx->p_msg_func) |
68 | 68 |
p_ctx->p_msg_func(p_ctx->p_msg_ctx, flp_msg_type_err, |
69 | 69 |
"invalid distributor size \"%s\"" |
70 | 70 |
" in line %u of config file\n", |
71 |
- value, p_ctx->line_no); |
|
71 |
+ p_value, p_ctx->line_no); |
|
72 | 72 |
return -1; |
73 | 73 |
} |
74 | 74 |
if (out >= FLP_OUTPUT_MAX_CNT) { |
... | ... |
@@ -227,7 +227,7 @@ int flp_config_proc_distri_addr(flp_config_ctx_t *p_ctx, char *p_setting_part2, |
227 | 227 |
* \return 0 in case of success, -1 in case of error |
228 | 228 |
*/ |
229 | 229 |
int flp_config_proc_mapping(flp_config_ctx_t *p_ctx, char *p_setting_part2, |
230 |
- char *value) |
|
230 |
+ char *p_value) |
|
231 | 231 |
{ |
232 | 232 |
char *ptr, *ptr2; |
233 | 233 |
unsigned long val; |
... | ... |
@@ -287,15 +287,15 @@ int flp_config_proc_mapping(flp_config_ctx_t *p_ctx, char *p_setting_part2, |
287 | 287 |
} |
288 | 288 |
|
289 | 289 |
/* get mapping parameters: base, factor, gamma */ |
290 |
- base = flp_strtod_noloc(value, &ptr); |
|
291 |
- if (ptr == value |
|
290 |
+ base = flp_strtod_noloc(p_value, &ptr); |
|
291 |
+ if (ptr == p_value |
|
292 | 292 |
|| (*ptr != 0 && *ptr != ' ' && *ptr != '\t' |
293 | 293 |
&& *ptr != '\r' && *ptr != '\n')) { |
294 | 294 |
if (p_ctx->p_msg_func) |
295 | 295 |
p_ctx->p_msg_func(p_ctx->p_msg_ctx, flp_msg_type_err, |
296 | 296 |
"invalid mapping parameters \"%s\"" |
297 | 297 |
" in line %u of config file\n", |
298 |
- value, p_ctx->line_no); |
|
298 |
+ p_value, p_ctx->line_no); |
|
299 | 299 |
return -1; |
300 | 300 |
} |
301 | 301 |
factor = flp_strtod_noloc(ptr, &ptr2); |
... | ... |
@@ -306,7 +306,7 @@ int flp_config_proc_mapping(flp_config_ctx_t *p_ctx, char *p_setting_part2, |
306 | 306 |
p_ctx->p_msg_func(p_ctx->p_msg_ctx, flp_msg_type_err, |
307 | 307 |
"invalid mapping parameters \"%s\"" |
308 | 308 |
" in line %u of config file\n", |
309 |
- value, p_ctx->line_no); |
|
309 |
+ p_value, p_ctx->line_no); |
|
310 | 310 |
return -1; |
311 | 311 |
} |
312 | 312 |
gamma = flp_strtod_noloc(ptr2, &ptr); |
... | ... |
@@ -317,7 +317,7 @@ int flp_config_proc_mapping(flp_config_ctx_t *p_ctx, char *p_setting_part2, |
317 | 317 |
p_ctx->p_msg_func(p_ctx->p_msg_ctx, flp_msg_type_err, |
318 | 318 |
"invalid mapping parameters \"%s\"" |
319 | 319 |
" in line %u of config file\n", |
320 |
- value, p_ctx->line_no); |
|
320 |
+ p_value, p_ctx->line_no); |
|
321 | 321 |
return -1; |
322 | 322 |
} |
323 | 323 |
if (gamma <= 0.0) { |
... | ... |
@@ -410,7 +410,7 @@ int flp_config_proc_pixel(flp_config_ctx_t *p_ctx, char *sz_pixel, |
410 | 410 |
* \return 0 in case of success, -1 in case of error |
411 | 411 |
*/ |
412 | 412 |
int flp_config_proc_output(flp_config_ctx_t *p_ctx, char *p_setting_part2, |
413 |
- char *value) |
|
413 |
+ char *p_value) |
|
414 | 414 |
{ |
415 | 415 |
char *ptr, *p_pos, *p_white, white; |
416 | 416 |
unsigned int distri, out, pix; |
... | ... |
@@ -469,7 +469,7 @@ int flp_config_proc_output(flp_config_ctx_t *p_ctx, char *p_setting_part2, |
469 | 469 |
/* process pixels */ |
470 | 470 |
|
471 | 471 |
/* process all parts separated by whitespace */ |
472 |
- p_pos = value; |
|
472 |
+ p_pos = p_value; |
|
473 | 473 |
err = 0; |
474 | 474 |
pix = 0; |
475 | 475 |
while (*p_pos != 0) { |
476 | 476 |