Merge branch 'fl/cvsserver'

diff --git a/config.c b/config.c
index 0614c2b29fa93b66065ec6bc20712d38193aec89..e323153ae4f91c661cf35fdeea3041a2a621b34e 100644 (file)
--- a/config.c
+++ b/config.c
@@ -523,7 +523,7 @@ static int store_aux(const char* key, const char* value)
        return 0;
 }
 
-static int write_error()
+static int write_error(void)
 {
        fprintf(stderr, "Failed to write new configuration file\n");
 
@@ -621,7 +621,7 @@ static ssize_t find_beginning_of_line(const char* contents, size_t size,
        size_t equal_offset = size, bracket_offset = size;
        ssize_t offset;
 
-       for (offset = offset_-2; offset > 0 
+       for (offset = offset_-2; offset > 0
                        && contents[offset] != '\n'; offset--)
                switch (contents[offset]) {
                        case '=': equal_offset = offset; break;
@@ -989,4 +989,3 @@ int git_config_rename_section(const char *old_name, const char *new_name)
        free(config_filename);
        return ret;
 }
-