mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

builder: rename "program_name" into "progname"

Browse Source 
"program_name" is already used as shorthand define for
program_invocation_short_name.
This commit is contained in:
Pino Toscano
2014-10-17 14:46:40 +02:00
parent 57512e7785
commit d2c853f414
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builder/index-parse.y
View File

@@ -153,8 +153,8 @@ yyerror (YYLTYPE * yylloc, yyscan_t scanner, struct parse_context *context, cons
int has_suffix = context->error_suffix != NULL && context->error_suffix[0] != 0;
fprintf (stderr, "%s%s%s%ssyntax error at line %d: %s%s%s\n",
context->program_name ? context->program_name : "",
context->program_name ? ": " : "",
context->progname ? context->progname : "",
context->progname ? ": " : "",
context->input_file ? context->input_file : "",
context->input_file ? ": " : "",
yylloc->first_line, msg,

2
builder/index-parser-c.c
View File

@@ -56,7 +56,7 @@ virt_builder_parse_index (value progv, value error_suffixv, value filenamev)
FILE *in;
parse_context_init (&context);
context.program_name = String_val (progv);
context.progname = String_val (progv);
context.input_file = String_val (filenamev);
context.error_suffix = String_val (error_suffixv);

2
builder/index-struct.h
View File

@@ -44,7 +44,7 @@ struct parse_context {
*/
int seen_comments;
const char *input_file;
const char *program_name;
const char *progname;
const char *error_suffix;
};