submodule-config.c: drop hashmap_cmp_fn cast

diff --git a/apply.c b/apply.c
index f24014a705edf5fc1f49e22502f563a469b850ed..b963d7d8fb7ee81300d4383b7bc007fc74af84c5 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -8,6 +8,7 @@
  */
 
 #include "cache.h"
+#include "config.h"
 #include "blob.h"
 #include "delta.h"
 #include "diff.h"
@@ -3694,8 +3695,7 @@ static int check_preimage(struct apply_state *state,
  is_new:
        patch->is_new = 1;
        patch->is_delete = 0;
-       free(patch->old_name);
-       patch->old_name = NULL;
+       FREE_AND_NULL(patch->old_name);
        return 0;
 }