Commit 26dcee98 authored by unknown's avatar unknown

extra/comp_err.c : Fix a merge error.


extra/comp_err.c:
  Fix a merge error (closing '}' was lost), correct formatting (tab -> blanks).
parent 4b364349
...@@ -542,6 +542,7 @@ static char *parse_default_language(char *str) ...@@ -542,6 +542,7 @@ static char *parse_default_language(char *str)
fprintf(stderr, fprintf(stderr,
"Unexpected EOL: No short language name after the keyword\n"); "Unexpected EOL: No short language name after the keyword\n");
DBUG_RETURN(0); DBUG_RETURN(0);
}
/* reading the short language tag */ /* reading the short language tag */
if (!(slang= get_word(&str))) if (!(slang= get_word(&str)))
...@@ -877,7 +878,7 @@ static void usage(void) ...@@ -877,7 +878,7 @@ static void usage(void)
print_version(); print_version();
printf("This software comes with ABSOLUTELY NO WARRANTY. " printf("This software comes with ABSOLUTELY NO WARRANTY. "
"This is free software,\n" "This is free software,\n"
"and you are welcome to modify and redistribute it under the GPL license.\n" "and you are welcome to modify and redistribute it under the GPL license.\n"
"Usage:\n"); "Usage:\n");
my_print_help(my_long_options); my_print_help(my_long_options);
my_print_variables(my_long_options); my_print_variables(my_long_options);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment