dpkg-divert: Inline rename_mv() into file_rename()

src/divertcmd.c

@@ -240,17 +240,6 @@ file_copy(const char *src, const char *realdst)
 	free(dst);
 }
 
-static void
-rename_mv(const char *src, const char *dst)
-{
-	if (rename(src, dst) == 0)
-		return;
-
-	/* If a simple rename didn't work try an atomic copy, rename, unlink
-	 * instead. */
-	file_copy(src, dst);
-}
-
 static void
 file_rename(struct file *src, struct file *dst)
 {
@@ -262,7 +251,11 @@ file_rename(struct file *src, struct file *dst)
 			ohshite(_("rename: remove duplicate old link '%s'"),
 			        src->name);
 	} else {
-		rename_mv(src->name, dst->name);
+		if (rename(src->name, dst->name) == 0)
+			return;
+
+		/* If a rename didn't work try moving the file instead. */
+		file_copy(src->name, dst->name);
 	}
 }