Merge branch 'mv/merge-in-c'

diff --git a/parse-options.c b/parse-options.c
index ae88885d4da573c85dbfbeea3061f3b026223710..2fd5edbf53546ac449a077439aa59ca5dd992274 100644 (file)
--- a/parse-options.c
+++ b/parse-options.c
@@ -5,12 +5,6 @@
 #define OPT_SHORT 1
 #define OPT_UNSET 2
 
-static inline const char *skip_prefix(const char *str, const char *prefix)
-{
-       size_t len = strlen(prefix);
-       return strncmp(str, prefix, len) ? NULL : str + len;
-}
-
 static int opterror(const struct option *opt, const char *reason, int flags)
 {
        if (flags & OPT_SHORT)