util: rework cunescape(), improve error handling

[elogind.git] / src / shared / util.h

diff --git a/src/shared/util.h b/src/shared/util.h
index 9f0149e1c5a39bf63e43b582e2af394b43be8995..2154623afd47cd243c6321cf8431576d2a84efdc 100644 (file)
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -312,9 +312,14 @@ char decchar(int x) _const_;
 int undecchar(char c) _const_;
 
 char *cescape(const char *s);
 int undecchar(char c) _const_;
 
 char *cescape(const char *s);

-char *cunescape(const char *s);
-char *cunescape_length(const char *s, size_t length);
-char *cunescape_length_with_prefix(const char *s, size_t length, const char *prefix);
+
+typedef enum UnescapeFlags {
+        UNESCAPE_RELAX = 1,
+} UnescapeFlags;
+
+int cunescape(const char *s, UnescapeFlags flags, char **ret);
+int cunescape_length(const char *s, size_t length, UnescapeFlags flags, char **ret);
+int cunescape_length_with_prefix(const char *s, size_t length, const char *prefix, UnescapeFlags flags, char **ret);

 
 char *xescape(const char *s, const char *bad);
 
 
 char *xescape(const char *s, const char *bad);
 


@@ -1015,7 +1020,7 @@ int take_password_lock(const char *root);
 int is_symlink(const char *path);
 int is_dir(const char *path, bool follow);
 
 int is_symlink(const char *path);
 int is_dir(const char *path, bool follow);
 

-typedef enum UnquoteFlags{
+typedef enum UnquoteFlags {

         UNQUOTE_RELAX     = 1,
         UNQUOTE_CUNESCAPE = 2,
 } UnquoteFlags;
         UNQUOTE_RELAX     = 1,
         UNQUOTE_CUNESCAPE = 2,
 } UnquoteFlags;