lib/mangle: const quialifier cleanup

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/include/mangle.h b/include/mangle.h
index 8c3888d9191d93218be41a30233087aed102c53c..0a4b60c1c8188b97dc66994e1451d02e1aa64a27 100644 (file)
--- a/include/mangle.h
+++ b/include/mangle.h
@@ -10,7 +10,7 @@ extern char *mangle(const char *s);
 extern void unmangle_to_buffer(const char *s, char *buf, size_t len);
 extern size_t unhexmangle_to_buffer(const char *s, char *buf, size_t len);
 
-extern char *unmangle(const char *s, char **end);
+extern char *unmangle(const char *s, const char **end);
 
 static inline void unmangle_string(char *s)
 {

diff --git a/lib/mangle.c b/lib/mangle.c
index 494360d7cbee238457e996edd7a52cf0bbd3a199..b61c57fcf0eb968c11d1f0a819382570fe15d93b 100644 (file)
--- a/lib/mangle.c
+++ b/lib/mangle.c
@@ -94,20 +94,20 @@ size_t unhexmangle_to_buffer(const char *s, char *buf, size_t len)
        return buf - buf0 + 1;
 }
 
-static inline char *skip_nonspaces(const char *s)
+static inline const char *skip_nonspaces(const char *s)
 {
        while (*s && !(*s == ' ' || *s == '\t'))
                s++;
-       return (char *) s;
+       return s;
 }
 
 /*
  * Returns mallocated buffer or NULL in case of error.
  */
-char *unmangle(const char *s, char **end)
+char *unmangle(const char *s, const char **end)
 {
        char *buf;
-       char *e;
+       const char *e;
        size_t sz;
 
        if (!s)

diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
index 8793f5e6ac5626609c1503c7b61b08b51b719810..89f7c4d3047c0f9bff8ae20553e819773f385e6f 100644 (file)
--- a/libmount/src/tab_parse.c
+++ b/libmount/src/tab_parse.c
@@ -272,7 +272,7 @@ static int mnt_parse_utab_line(struct libmnt_fs *fs, const char *s)
        assert(!fs->target);
 
        while (p && *p) {
-               char *end = NULL;
+               const char *end = NULL;
 
                while (*p == ' ') p++;
                if (!*p)