Merge branch 'jc/read-tree-df' (early part)

diff --git a/interpolate.c b/interpolate.c
index 62701d8435e6c113bf683c72a038874ed1acc2de..fb30694f4741147bba62350f704111d3afbf8133 100644 (file)
--- a/interpolate.c
+++ b/interpolate.c
@@ -2,16 +2,14 @@
  * Copyright 2006 Jon Loeliger
  */
 
-#include <string.h>
-
 #include "git-compat-util.h"
 #include "interpolate.h"
 
 
-void interp_set_entry(struct interp *table, int slot, char *value)
+void interp_set_entry(struct interp *table, int slot, const char *value)
 {
        char *oldval = table[slot].value;
-       char *newval = value;
+       char *newval = NULL;
 
        if (oldval)
                free(oldval);
@@ -57,7 +55,7 @@ int interpolate(char *result, int reslen,
        const char *src = orig;
        char *dest = result;
        int newlen = 0;
-       char *name, *value;
+       const char *name, *value;
        int namelen, valuelen;
        int i;
        char c;