builtin/config.c: rename check_blob_write() -> check_write()
The function will be reused to check for other conditions which prevent write. Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kirill A. Shutemov committed
Feb 19, 2014 at 00:58 UTC
6aea9f0fdd2f013e9b63137727c73da02d42a1be
1 file changed
+9
-9
builtin/config.c
+9
-9
@@ -362,7 +362,7 @@ static int get_colorbool(int print)
362
return get_colorbool_found ? 0 : 1;
363
}
364
365
-static void check_blob_write(void)
365
+static void check_write(void)
366
{
367
if (given_config_blob)
368
die("writing config blobs is not supported");
@@ -572,7 +572,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
572
}
573
else if (actions == ACTION_SET) {
574
int ret;
575
- check_blob_write();
575
+ check_write();
576
check_argc(argc, 2, 2);
577
value = normalize_value(argv[0], argv[1]);
578
ret = git_config_set_in_file(given_config_file, argv[0], value);
@@ -582,21 +582,21 @@ int cmd_config(int argc, const char **argv, const char *prefix)
582
return ret;
583
}
584
else if (actions == ACTION_SET_ALL) {
585
- check_blob_write();
585
+ check_write();
586
check_argc(argc, 2, 3);
587
value = normalize_value(argv[0], argv[1]);
588
return git_config_set_multivar_in_file(given_config_file,
589
argv[0], value, argv[2], 0);
590
}
591
else if (actions == ACTION_ADD) {
592
- check_blob_write();
592
+ check_write();
593
check_argc(argc, 2, 2);
594
value = normalize_value(argv[0], argv[1]);
595
return git_config_set_multivar_in_file(given_config_file,
596
argv[0], value, "^$", 0);
597
}
598
else if (actions == ACTION_REPLACE_ALL) {
599
- check_blob_write();
599
+ check_write();
600
check_argc(argc, 2, 3);
601
value = normalize_value(argv[0], argv[1]);
602
return git_config_set_multivar_in_file(given_config_file,
@@ -623,7 +623,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
623
return get_urlmatch(argv[0], argv[1]);
624
}
625
else if (actions == ACTION_UNSET) {
626
- check_blob_write();
626
+ check_write();
627
check_argc(argc, 1, 2);
628
if (argc == 2)
629
return git_config_set_multivar_in_file(given_config_file,
@@ -633,14 +633,14 @@ int cmd_config(int argc, const char **argv, const char *prefix)
633
argv[0], NULL);
634
}
635
else if (actions == ACTION_UNSET_ALL) {
636
- check_blob_write();
636
+ check_write();
637
check_argc(argc, 1, 2);
638
return git_config_set_multivar_in_file(given_config_file,
639
argv[0], NULL, argv[1], 1);
640
}
641
else if (actions == ACTION_RENAME_SECTION) {
642
int ret;
643
- check_blob_write();
643
+ check_write();
644
check_argc(argc, 2, 2);
645
ret = git_config_rename_section_in_file(given_config_file,
646
argv[0], argv[1]);
@@ -651,7 +651,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
651
}
652
else if (actions == ACTION_REMOVE_SECTION) {
653
int ret;
654
- check_blob_write();
654
+ check_write();
655
check_argc(argc, 1, 1);
656
ret = git_config_rename_section_in_file(given_config_file,
657
argv[0], NULL);