Change the dumpsys_dump() function signature

Change-Id: Iaf20a0e29afab2f2eac6b489757605ea5aaddb81

diff --git a/src/dumpsys/dumpsys.c b/src/dumpsys/dumpsys.c
index c4049ae..a7447b9 100644 (file)
--- a/src/dumpsys/dumpsys.c
+++ b/src/dumpsys/dumpsys.c
@@ -68,7 +68,7 @@ static bool copy_data(int dest_fd, int source_fd)
        return true;
 }
 
-static void print_help(char **argv)
+static void print_help(const char **argv)
 {
        printf("Usage:\n");
        printf("\t%s [-o filename] <service_name> -- [service arguments]\n\n", argv[0]);
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
        }
 
        if (optind >= argc) {
-               print_help(argv);
+               print_help((const char **)argv);
                goto end;
        }
 
@@ -103,10 +103,10 @@ int main(int argc, char *argv[])
        }
 
        int i = optind;
-       char *service_name = argv[i];
+       const char *service_name = argv[i];
 
        int in_fd;
-       if (dumpsys_dump(service_name, argc-i-1, &argv[i+1], &in_fd) == TIZEN_ERROR_NONE)
+       if (dumpsys_dump(service_name, argc-i-1, (const char **)&argv[i+1], &in_fd) == TIZEN_ERROR_NONE)
                result = copy_data(out_fd, in_fd);
 
 end:

diff --git a/src/dumpsys/libdumpsys.c b/src/dumpsys/libdumpsys.c
index 5875b03..c4cd28f 100644 (file)
--- a/src/dumpsys/libdumpsys.c
+++ b/src/dumpsys/libdumpsys.c
@@ -40,7 +40,7 @@
 
 #include "common.h"
 
-static GVariantBuilder* prepare_dump_args(int argc, char *argv[])
+static GVariantBuilder* prepare_dump_args(int argc, const char *argv[])
 {
        GVariantBuilder *dump_args = g_variant_builder_new(G_VARIANT_TYPE("as"));
 
@@ -130,7 +130,7 @@ static GDBusConnection* make_connection()
        return connection;
 }
 
-API_FUNCTION int dumpsys_dump(char *service_name, int argc, char **argv, int *out_fd)
+API_FUNCTION int dumpsys_dump(const char *service_name, int argc, const char **argv, int *out_fd)
 {
        if (service_name == NULL || argc < 0 || argv == NULL || out_fd == NULL)
                return TIZEN_ERROR_INVALID_PARAMETER;

diff --git a/src/dumpsys/libdumpsys.h b/src/dumpsys/libdumpsys.h
index 9cf80f2..7ed6a34 100644 (file)
--- a/src/dumpsys/libdumpsys.h
+++ b/src/dumpsys/libdumpsys.h
@@ -17,6 +17,6 @@
 #ifndef __LIBDUMPSYS_H__
 #define __LIBDUMPSYS_H__
 
-int dumpsys_dump(char *service_name, int argc, char **argv, int *out_fd);
+int dumpsys_dump(const char *service_name, int argc, const char **argv, int *out_fd);
 
 #endif  // __LIBDUMPSYS_H__

diff --git a/tests/unit/test_libdumpsys.c b/tests/unit/test_libdumpsys.c
index d0aef31..984fa5f 100644 (file)
--- a/tests/unit/test_libdumpsys.c
+++ b/tests/unit/test_libdumpsys.c
@@ -60,8 +60,8 @@ gint __wrap_g_unix_fd_list_get(GUnixFDList *list,
 
 void dumpsys_dump_ok(void **state)
 {
-       static char *t_service_name = "some.serivce.name";
-       static char *t_argv[] = {"arg1", "arg2"};
+       static const char *t_service_name = "some.serivce.name";
+       static const char *t_argv[] = {"arg1", "arg2"};
        GDBusConnection *t_connection = (GDBusConnection*)123;
        GVariant *t_body = g_variant_new("(i)", 123);
        GDBusMessage *t_reply = g_dbus_message_new();
@@ -104,37 +104,37 @@ void dumpsys_dump_ok(void **state)
 
 void dumpsys_dump_fail1(void **state)
 {
-       static char *t_argv[] = {"arg1", "arg2"};
+       static const char *t_argv[] = {"arg1", "arg2"};
        int t_out_fd;
        assert_int_equal(dumpsys_dump(NULL, 2, t_argv, &t_out_fd), TIZEN_ERROR_INVALID_PARAMETER);
 }
 
 void dumpsys_dump_fail2(void **state)
 {
-       static char *t_service_name = "some.serivce.name";
-       static char *t_argv[] = {"arg1", "arg2"};
+       static const char *t_service_name = "some.serivce.name";
+       static const char *t_argv[] = {"arg1", "arg2"};
        int t_out_fd;
        assert_int_equal(dumpsys_dump(t_service_name, -1, t_argv, &t_out_fd), TIZEN_ERROR_INVALID_PARAMETER);
 }
 
 void dumpsys_dump_fail3(void **state)
 {
-       static char *t_service_name = "some.serivce.name";
+       static const char *t_service_name = "some.serivce.name";
        int t_out_fd;
        assert_int_equal(dumpsys_dump(t_service_name, 2, NULL, &t_out_fd), TIZEN_ERROR_INVALID_PARAMETER);
 }
 
 void dumpsys_dump_fail4(void **state)
 {
-       static char *t_service_name = "some.serivce.name";
-       static char *t_argv[] = {"arg1", "arg2"};
+       static const char *t_service_name = "some.serivce.name";
+       static const char *t_argv[] = {"arg1", "arg2"};
        assert_int_equal(dumpsys_dump(t_service_name, 2, t_argv, NULL), TIZEN_ERROR_INVALID_PARAMETER);
 }
 
 void dumpsys_dump_fail5(void **state)
 {
-       static char *t_service_name = "some.serivce.name";
-       static char *t_argv[] = {"arg1", "arg2"};
+       static const char *t_service_name = "some.serivce.name";
+       static const char *t_argv[] = {"arg1", "arg2"};
        int t_out_fd;
 
 
@@ -148,8 +148,8 @@ void dumpsys_dump_fail5(void **state)
 
 void dumpsys_dump_fail6(void **state)
 {
-       static char *t_service_name = "some.serivce.name";
-       static char *t_argv[] = {"arg1", "arg2"};
+       static const char *t_service_name = "some.serivce.name";
+       static const char *t_argv[] = {"arg1", "arg2"};
        GDBusConnection *t_connection = (GDBusConnection*)123;
        GVariant *t_body = g_variant_new("(i)", 123);
        GDBusMessage *t_reply = g_dbus_message_new();
@@ -185,8 +185,8 @@ void dumpsys_dump_fail6(void **state)
 
 void dumpsys_dump_fail7(void **state)
 {
-       static char *t_service_name = "some.serivce.name";
-       static char *t_argv[] = {"arg1", "arg2"};
+       static const char *t_service_name = "some.serivce.name";
+       static const char *t_argv[] = {"arg1", "arg2"};
        GDBusConnection *t_connection = (GDBusConnection*)123;
        GVariant *t_body = g_variant_new("(i)", DUMP_FAIL);
        GDBusMessage *t_reply = g_dbus_message_new();
@@ -220,8 +220,8 @@ void dumpsys_dump_fail7(void **state)
 
 void dumpsys_dump_fail8(void **state)
 {
-       static char *t_service_name = "some.serivce.name";
-       static char *t_argv[] = {"arg1", "arg2"};
+       static const char *t_service_name = "some.serivce.name";
+       static const char *t_argv[] = {"arg1", "arg2"};
        GDBusConnection *t_connection = (GDBusConnection*)123;
        GVariant *t_body = g_variant_new("(i)", 123);
        GDBusMessage *t_reply = g_dbus_message_new();
@@ -258,8 +258,8 @@ void dumpsys_dump_fail8(void **state)
 
 void dumpsys_dump_fail9(void **state)
 {
-       static char *t_service_name = "some.serivce.name";
-       static char *t_argv[] = {"arg1", "arg2"};
+       static const char *t_service_name = "some.serivce.name";
+       static const char *t_argv[] = {"arg1", "arg2"};
        GDBusConnection *t_connection = (GDBusConnection*)123;
        GVariant *t_body = g_variant_new("(i)", 123);
        GDBusMessage *t_reply = g_dbus_message_new();