Make arguments for enumerator_create_token|directory const

diff --git a/src/libstrongswan/utils/enumerator.c b/src/libstrongswan/utils/enumerator.c
index fb461b448db362b8ec26e05921f3ac548cc47f9a..53c94f9dde62a3f82d65d68b2ab26e9d6715894e 100644 (file)
--- a/src/libstrongswan/utils/enumerator.c
+++ b/src/libstrongswan/utils/enumerator.c
@@ -121,7 +121,7 @@ static bool enumerate_dir_enum(dir_enum_t *this, char **relative,
 /**
  * See header
  */
-enumerator_t* enumerator_create_directory(char *path)
+enumerator_t* enumerator_create_directory(const char *path)
 {
        int len;
        dir_enum_t *this = malloc_thing(dir_enum_t);
@@ -168,9 +168,9 @@ typedef struct {
        /** current position */
        char *pos;
        /** separater chars */
-       char *sep;
+       const char *sep;
        /** trim chars */
-       char *trim;
+       const char *trim;
 } token_enum_t;
 
 /**
@@ -187,7 +187,8 @@ static void destroy_token_enum(token_enum_t *this)
  */
 static bool enumerate_token_enum(token_enum_t *this, char **token)
 {
-       char *pos = NULL, *tmp, *sep, *trim;
+       const char *sep, *trim;
+       char *pos = NULL, *tmp;
        bool last = FALSE;
 
        /* trim leading characters/separators */
@@ -303,7 +304,8 @@ static bool enumerate_token_enum(token_enum_t *this, char **token)
 /**
  * See header
  */
-enumerator_t* enumerator_create_token(char *string, char *sep, char *trim)
+enumerator_t* enumerator_create_token(const char *string, const char *sep,
+                                                                         const char *trim)
 {
        token_enum_t *enumerator = malloc_thing(token_enum_t);
 

diff --git a/src/libstrongswan/utils/enumerator.h b/src/libstrongswan/utils/enumerator.h
index 12b5712aef477d9861349d2fb1d54ab7a9c4da78..8c3d701739a2439ebf6246d6d61c4ce9f7d0ab70 100644 (file)
--- a/src/libstrongswan/utils/enumerator.h
+++ b/src/libstrongswan/utils/enumerator.h
@@ -93,7 +93,7 @@ enumerator_t *enumerator_create_single(void *item, void (*cleanup)(void *item));
  * @param path         path of the directory
  * @return                     the directory enumerator, NULL on failure
  */
-enumerator_t* enumerator_create_directory(char *path);
+enumerator_t* enumerator_create_directory(const char *path);
 
 /**
  * Create an enumerator over tokens of a string.
@@ -106,7 +106,8 @@ enumerator_t* enumerator_create_directory(char *path);
  * @param trim         characters to trim from tokens
  * @return                     enumerator over char* tokens
  */
-enumerator_t* enumerator_create_token(char *string, char *sep, char *trim);
+enumerator_t* enumerator_create_token(const char *string, const char *sep,
+                                                                         const char *trim);
 
 /**
  * Creates an enumerator which enumerates over enumerated enumerators :-).