Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GVFS MSVC compile errors #5

Merged
merged 2 commits into from
Jul 25, 2018
Merged

GVFS MSVC compile errors #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85780b0
convert.c: replace "\e" escapes with "\033".
bbolli Jul 9, 2018
88cd807
builtin/config: work around an unsized array forward declaration
bbolli Jul 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions builtin/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static int show_origin;
{ OPTION_CALLBACK, (s), (l), (v), NULL, (h), PARSE_OPT_NOARG | \
PARSE_OPT_NONEG, option_parse_type, (i) }

static struct option builtin_config_options[];
static NORETURN void usage_builtin_config(void);

static int option_parse_type(const struct option *opt, const char *arg,
int unset)
Expand Down Expand Up @@ -111,8 +111,7 @@ static int option_parse_type(const struct option *opt, const char *arg,
* --type=int'.
*/
error("only one type at a time.");
usage_with_options(builtin_config_usage,
builtin_config_options);
usage_builtin_config();
}
*to_type = new_type;

Expand Down Expand Up @@ -157,11 +156,16 @@ static struct option builtin_config_options[] = {
OPT_END(),
};

static NORETURN void usage_builtin_config(void)
{
usage_with_options(builtin_config_usage, builtin_config_options);
}

static void check_argc(int argc, int min, int max) {
if (argc >= min && argc <= max)
return;
error("wrong number of arguments");
usage_with_options(builtin_config_usage, builtin_config_options);
usage_builtin_config();
}

static void show_config_origin(struct strbuf *buf)
Expand Down Expand Up @@ -596,7 +600,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
if (use_global_config + use_system_config + use_local_config +
!!given_config_source.file + !!given_config_source.blob > 1) {
error("only one config file at a time.");
usage_with_options(builtin_config_usage, builtin_config_options);
usage_builtin_config();
}

if (use_local_config && nongit)
Expand Down Expand Up @@ -660,38 +664,37 @@ int cmd_config(int argc, const char **argv, const char *prefix)

if ((actions & (ACTION_GET_COLOR|ACTION_GET_COLORBOOL)) && type) {
error("--get-color and variable type are incoherent");
usage_with_options(builtin_config_usage, builtin_config_options);
usage_builtin_config();
}

if (HAS_MULTI_BITS(actions)) {
error("only one action at a time.");
usage_with_options(builtin_config_usage, builtin_config_options);
usage_builtin_config();
}
if (actions == 0)
switch (argc) {
case 1: actions = ACTION_GET; break;
case 2: actions = ACTION_SET; break;
case 3: actions = ACTION_SET_ALL; break;
default:
usage_with_options(builtin_config_usage, builtin_config_options);
usage_builtin_config();
}
if (omit_values &&
!(actions == ACTION_LIST || actions == ACTION_GET_REGEXP)) {
error("--name-only is only applicable to --list or --get-regexp");
usage_with_options(builtin_config_usage, builtin_config_options);
usage_builtin_config();
}

if (show_origin && !(actions &
(ACTION_GET|ACTION_GET_ALL|ACTION_GET_REGEXP|ACTION_LIST))) {
error("--show-origin is only applicable to --get, --get-all, "
"--get-regexp, and --list.");
usage_with_options(builtin_config_usage, builtin_config_options);
usage_builtin_config();
}

if (default_value && !(actions & ACTION_GET)) {
error("--default is only applicable to --get");
usage_with_options(builtin_config_usage,
builtin_config_options);
usage_builtin_config();
}

if (actions & PAGING_ACTIONS)
Expand Down
2 changes: 1 addition & 1 deletion convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ static void trace_encoding(const char *context, const char *path,
strbuf_addf(&trace, "%s (%s, considered %s):\n", context, path, encoding);
for (i = 0; i < len && buf; ++i) {
strbuf_addf(
&trace,"| \e[2m%2i:\e[0m %2x \e[2m%c\e[0m%c",
&trace, "| \033[2m%2i:\033[0m %2x \033[2m%c\033[0m%c",
i,
(unsigned char) buf[i],
(buf[i] > 32 && buf[i] < 127 ? buf[i] : ' '),
Expand Down