Improved njs_string_to_c_string() prototype.

To avoid excessive casts.

diff --git a/src/njs_fs.c b/src/njs_fs.c
index 924223a57109a787c814db95d94fc082887a7268..4bbbeec5e2070fba95842bce9b4310a7e81af640 100644 (file)
--- a/src/njs_fs.c
+++ b/src/njs_fs.c
@@ -156,7 +156,7 @@ njs_fs_read_file(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         return NJS_ERROR;
     }
 
-    path = (char *) njs_string_to_c_string(vm, &args[1]);
+    path = njs_string_to_c_string(vm, &args[1]);
     if (njs_slow_path(path == NULL)) {
         return NJS_ERROR;
     }
@@ -380,7 +380,7 @@ njs_fs_read_file_sync(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         return NJS_ERROR;
     }
 
-    path = (char *) njs_string_to_c_string(vm, &args[1]);
+    path = njs_string_to_c_string(vm, &args[1]);
     if (njs_slow_path(path == NULL)) {
         return NJS_ERROR;
     }
@@ -660,7 +660,7 @@ static njs_int_t njs_fs_write_file_internal(njs_vm_t *vm, njs_value_t *args,
         md = 0666;
     }
 
-    path = (char *) njs_string_to_c_string(vm, &args[1]);
+    path = njs_string_to_c_string(vm, &args[1]);
     if (njs_slow_path(path == NULL)) {
         return NJS_ERROR;
     }
@@ -837,7 +837,7 @@ njs_fs_write_file_sync_internal(njs_vm_t *vm, njs_value_t *args,
         md = 0666;
     }
 
-    path = (char *) njs_string_to_c_string(vm, &args[1]);
+    path = njs_string_to_c_string(vm, &args[1]);
     if (njs_slow_path(path == NULL)) {
         return NJS_ERROR;
     }
@@ -923,12 +923,12 @@ njs_fs_rename_sync(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         return NJS_ERROR;
     }
 
-    old_path = (const char *) njs_string_to_c_string(vm, njs_argument(args, 1));
+    old_path = njs_string_to_c_string(vm, njs_argument(args, 1));
     if (njs_slow_path(old_path == NULL)) {
         return NJS_ERROR;
     }
 
-    new_path = (const char *) njs_string_to_c_string(vm, njs_argument(args, 2));
+    new_path = njs_string_to_c_string(vm, njs_argument(args, 2));
     if (njs_slow_path(new_path == NULL)) {
         return NJS_ERROR;
     }

diff --git a/src/njs_string.c b/src/njs_string.c
index d96a310f4408f36023855ef3b440c65b3704f26d..f512740c55822318b260f13c9c58db41f8c5531d 100644 (file)
--- a/src/njs_string.c
+++ b/src/njs_string.c
@@ -3984,7 +3984,7 @@ njs_string_to_index(const njs_value_t *value)
  * is returned as is, otherwise the new copy is allocated with
  * the terminating zero byte.
  */
-const u_char *
+const char *
 njs_string_to_c_string(njs_vm_t *vm, njs_value_t *value)
 {
     u_char  *p, *data, *start;
@@ -3996,7 +3996,7 @@ njs_string_to_c_string(njs_vm_t *vm, njs_value_t *value)
 
         if (size < NJS_STRING_SHORT) {
             start[size] = '\0';
-            return start;
+            return (const char *) start;
         }
 
     } else {
@@ -4013,7 +4013,7 @@ njs_string_to_c_string(njs_vm_t *vm, njs_value_t *value)
     p = njs_cpymem(data, start, size);
     *p++ = '\0';
 
-    return data;
+    return (const char *) data;
 }
 
 

diff --git a/src/njs_string.h b/src/njs_string.h
index e280e502b4b34c2c22f31349bd09ff95b9e7fadd..d5cbe144325b716e52a39af30f6690753f4e9f3f 100644 (file)
--- a/src/njs_string.h
+++ b/src/njs_string.h
@@ -177,7 +177,7 @@ const u_char *njs_string_offset(const u_char *start, const u_char *end,
 uint32_t njs_string_index(njs_string_prop_t *string, uint32_t offset);
 void njs_string_offset_map_init(const u_char *start, size_t size);
 double njs_string_to_index(const njs_value_t *value);
-const u_char *njs_string_to_c_string(njs_vm_t *vm, njs_value_t *value);
+const char *njs_string_to_c_string(njs_vm_t *vm, njs_value_t *value);
 njs_int_t njs_string_encode_uri(njs_vm_t *vm, njs_value_t *args,
     njs_uint_t nargs, njs_index_t unused);
 njs_int_t njs_string_encode_uri_component(njs_vm_t *vm, njs_value_t *args,