summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak2018-07-20 15:31:42 +0200
committerKarel Zak2018-07-20 15:31:42 +0200
commit78c66fc61dc42f36c4c49bad811083cabc666583 (patch)
tree81a323de5fc5fe1f47a601586bc8fc491475669c
parentinclude/list, include/c: update and container_of() (diff)
downloadkernel-qcow2-util-linux-78c66fc61dc42f36c4c49bad811083cabc666583.tar.gz
kernel-qcow2-util-linux-78c66fc61dc42f36c4c49bad811083cabc666583.tar.xz
kernel-qcow2-util-linux-78c66fc61dc42f36c4c49bad811083cabc666583.zip
lib/mangle: const quialifier cleanup
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--include/mangle.h2
-rw-r--r--lib/mangle.c8
-rw-r--r--libmount/src/tab_parse.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/include/mangle.h b/include/mangle.h
index 8c3888d91..0a4b60c1c 100644
--- 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 494360d7c..b61c57fcf 100644
--- 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 8793f5e6a..89f7c4d30 100644
--- 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)