Merge branch 'ss/submodule-summary-in-c'

[thirdparty/git.git] / config.c

diff --git a/config.c b/config.c
index d92321a279072f019995ac0818fcdf4c10532127..2bdff4457be7d5b1e1fd5f6acb558ac41b946a8c 100644 (file)
--- a/config.c
+++ b/config.c
@@ -2300,11 +2300,11 @@ int git_config_get_expiry(const char *key, const char **output)
 
 int git_config_get_expiry_in_days(const char *key, timestamp_t *expiry, timestamp_t now)
 {
-       char *expiry_string;
+       const char *expiry_string;
        intmax_t days;
        timestamp_t when;
 
-       if (git_config_get_string(key, &expiry_string))
+       if (git_config_get_string_tmp(key, &expiry_string))
                return 1; /* no such thing */
 
        if (git_parse_signed(expiry_string, &days, maximum_signed_value_of_type(int))) {
@@ -3128,7 +3128,7 @@ static int git_config_copy_or_rename_section_in_file(const char *config_filename
        }
 
        while (fgets(buf, sizeof(buf), config_file)) {
-               int i;
+               unsigned i;
                int length;
                int is_section = 0;
                char *output = buf;