fix typo

Change-Id: Ic2f88edab7eba75b9297c310bd57cc50fd2a80bb

diff --git a/src/wayland-tbm-int.h b/src/wayland-tbm-int.h
index 498c78c..f80e287 100644 (file)
--- a/src/wayland-tbm-int.h
+++ b/src/wayland-tbm-int.h
@@ -156,37 +156,37 @@ void
 _wayland_tbm_util_get_appname_from_pid(long pid, char *str);
 
 int
-_waylend_tbm_util_target_parse(char * target_str, struct wayland_tbm_monitor_target *target);
+_wayland_tbm_util_target_parse(char * target_str, struct wayland_tbm_monitor_target *target);
 
 int
-_waylend_tbm_util_scale_parse(char * scale_str, double *scale);
+_wayland_tbm_util_scale_parse(char * scale_str, double *scale);
 
 int
-_waylend_tbm_util_debug_level_parse(char * str, int *debug_level);
+_wayland_tbm_util_debug_level_parse(char * str, int *debug_level);
 
 int
 _wayland_tbm_util_show_path_parse(char * path_str, char * cwd, struct wayland_tbm_monitor_path *path);
 
 WL_TBM_MONITOR_PROC_STATE
-_waylend_tbm_util_proc_state_parse(char * str);
+_wayland_tbm_util_proc_state_parse(char * str);
 
 WL_TBM_MONITOR_RES
-_waylend_tbm_util_resource_parse(char * str);
+_wayland_tbm_util_resource_parse(char * str);
 
 int
-_waylend_tbm_util_dump_queue(WL_TBM_MONITOR_PROC_STATE cmd, tbm_bufmgr bufmgr, double scale);
+_wayland_tbm_util_dump_queue(WL_TBM_MONITOR_PROC_STATE cmd, tbm_bufmgr bufmgr, double scale);
 
 void
-_waylend_tbm_util_dump_snapshot(tbm_bufmgr bufmgr, double scale, char *path);
+_wayland_tbm_util_dump_snapshot(tbm_bufmgr bufmgr, double scale, char *path);
 
 int
-_waylend_tbm_util_trace(WL_TBM_MONITOR_PROC_STATE cmd, WL_TBM_MONITOR_RES res, tbm_bufmgr bufmgr);
+_wayland_tbm_util_trace(WL_TBM_MONITOR_PROC_STATE cmd, WL_TBM_MONITOR_RES res, tbm_bufmgr bufmgr);
 
 char *
 _wayland_tbm_dump_directory_make(void);
 
 void
-_waylend_tbm_util_set_log_level(int debug_level);
+_wayland_tbm_util_set_log_level(int debug_level);
 
 int
 wayland_tbm_monitor_server_init(struct wayland_tbm_server *tbm_srv);

diff --git a/src/wayland-tbm-monitor-client.c b/src/wayland-tbm-monitor-client.c
index 53f9b3b..44a7614 100644 (file)
--- a/src/wayland-tbm-monitor-client.c
+++ b/src/wayland-tbm-monitor-client.c
@@ -43,7 +43,7 @@ DEALINGS IN THE SOFTWARE.
 
 static struct wl_tbm_monitor *tbm_monitor;
 
-void _waylend_tbm_monitor_client_print_show_to_file(char* show_str)
+void _wayland_tbm_monitor_client_print_show_to_file(char* show_str)
 {
        FILE * f = NULL;
        static int c = 0;
@@ -57,7 +57,7 @@ void _waylend_tbm_monitor_client_print_show_to_file(char* show_str)
        }
 }
 
-void _waylend_tbm_monitor_client_show(int argc, char *argv[],
+void _wayland_tbm_monitor_client_show(int argc, char *argv[],
                                      char *reply, int *len, struct wayland_tbm_client *tbm_client)
 {
        struct wayland_tbm_monitor_path path = {0};
@@ -71,7 +71,7 @@ void _waylend_tbm_monitor_client_show(int argc, char *argv[],
        /* we have to save result to some file as reply can be very long */
        show_str = tbm_bufmgr_debug_tbm_info_get((tbm_bufmgr)wayland_tbm_client_get_bufmgr(tbm_client));
        if (show_str) {
-               _waylend_tbm_monitor_client_print_show_to_file(show_str);
+               _wayland_tbm_monitor_client_print_show_to_file(show_str);
                free(show_str);
        }
 
@@ -79,7 +79,7 @@ void _waylend_tbm_monitor_client_show(int argc, char *argv[],
        WL_TBM_MONITOR_SNPRINTF(reply, *len, "\n");
 }
 
-void _waylend_tbm_monitor_client_dump_snapshot(int argc, char *argv[],
+void _wayland_tbm_monitor_client_dump_snapshot(int argc, char *argv[],
                                      char *reply, int *len, struct wayland_tbm_client *tbm_client)
 {
        double scale = 0;
@@ -87,59 +87,59 @@ void _waylend_tbm_monitor_client_dump_snapshot(int argc, char *argv[],
        char *path = NULL;
 
        for (i = 1; i < argc; i++) {
-               if (_waylend_tbm_util_scale_parse(argv[i], &scale))
+               if (_wayland_tbm_util_scale_parse(argv[i], &scale))
                        break;
        }
 
        path = _wayland_tbm_dump_directory_make();
-       _waylend_tbm_util_dump_snapshot((tbm_bufmgr)wayland_tbm_client_get_bufmgr(tbm_client), scale, path);
+       _wayland_tbm_util_dump_snapshot((tbm_bufmgr)wayland_tbm_client_get_bufmgr(tbm_client), scale, path);
        WL_TBM_MONITOR_SNPRINTF(reply, *len, "client(%d): snapshot dump is done. path=%s\n", getpid(), path);
        free(path);
 }
 
-void _waylend_tbm_monitor_client_dump_queue(int argc, char *argv[],
+void _wayland_tbm_monitor_client_dump_queue(int argc, char *argv[],
                                      char *reply, int *len, struct wayland_tbm_client *tbm_client)
 {
        int st;
        double scale = 0;
        int i;
 
-       st = _waylend_tbm_util_proc_state_parse(argv[1]);
+       st = _wayland_tbm_util_proc_state_parse(argv[1]);
 
        for (i = 2; i < argc; i++) {
-               if (_waylend_tbm_util_scale_parse(argv[i], &scale))
+               if (_wayland_tbm_util_scale_parse(argv[i], &scale))
                        break;
        }
 
-       st = _waylend_tbm_util_dump_queue(st, (tbm_bufmgr)wayland_tbm_client_get_bufmgr(tbm_client), scale);
+       st = _wayland_tbm_util_dump_queue(st, (tbm_bufmgr)wayland_tbm_client_get_bufmgr(tbm_client), scale);
        WL_TBM_MONITOR_SNPRINTF(reply, *len, "client(%d): queue dump state: %s\n", getpid(),
                                                        st ? "on" : "off");
 }
 
-void _waylend_tbm_monitor_client_trace(int argc, char *argv[],
+void _wayland_tbm_monitor_client_trace(int argc, char *argv[],
                                      char *reply, int *len, struct wayland_tbm_client *tbm_client)
 {
        int st;
 
-       st = _waylend_tbm_util_trace(_waylend_tbm_util_proc_state_parse(argv[1]),
-                                                               _waylend_tbm_util_resource_parse(argv[2]),
+       st = _wayland_tbm_util_trace(_wayland_tbm_util_proc_state_parse(argv[1]),
+                                                               _wayland_tbm_util_resource_parse(argv[2]),
                                                                (tbm_bufmgr)wayland_tbm_client_get_bufmgr(tbm_client));
        WL_TBM_MONITOR_SNPRINTF(reply, *len, "client(%d): trace state: %s\n", getpid() ,
                                                        st ? "on" : "off");
 }
 
-void _waylend_tbm_monitor_client_debug_level(int argc, char *argv[],
+void _wayland_tbm_monitor_client_debug_level(int argc, char *argv[],
                                      char *reply, int *len, struct wayland_tbm_client *tbm_client)
 {
        int debug_level = TBM_LOG_LEVEL_NONE;
        int i;
 
        for (i = 1; i < argc; i++) {
-               if (_waylend_tbm_util_debug_level_parse(argv[i], &debug_level))
+               if (_wayland_tbm_util_debug_level_parse(argv[i], &debug_level))
                        break;
        }
 
-       _waylend_tbm_util_set_log_level(debug_level);
+       _wayland_tbm_util_set_log_level(debug_level);
        WL_TBM_MONITOR_SNPRINTF(reply, *len, "client(%d): set tbm_log debug_level(%d)\n", getpid(), debug_level);
 }
 
@@ -149,23 +149,23 @@ static struct {
 } option_proc[] = {
        {
                "show",
-               _waylend_tbm_monitor_client_show,
+               _wayland_tbm_monitor_client_show,
        },
        {
                "dump_snapshot",
-               _waylend_tbm_monitor_client_dump_snapshot,
+               _wayland_tbm_monitor_client_dump_snapshot,
        },
        {
                "dump_queue",
-               _waylend_tbm_monitor_client_dump_queue,
+               _wayland_tbm_monitor_client_dump_queue,
        },
        {
                "trace",
-               _waylend_tbm_monitor_client_trace,
+               _wayland_tbm_monitor_client_trace,
        },
        {
                "debug_level",
-               _waylend_tbm_monitor_client_debug_level,
+               _wayland_tbm_monitor_client_debug_level,
        },
 };
 

diff --git a/src/wayland-tbm-monitor-server.c b/src/wayland-tbm-monitor-server.c
index 6bf415c..4b3b2af 100644 (file)
--- a/src/wayland-tbm-monitor-server.c
+++ b/src/wayland-tbm-monitor-server.c
@@ -251,7 +251,7 @@ _send_request_to_client_with_wait(struct wayland_tbm_monitore_request *r,
 }
 
 static void
-_waylend_tbm_monitor_server_list(struct wayland_tbm_monitore_request *r)
+_wayland_tbm_monitor_server_list(struct wayland_tbm_monitore_request *r)
 {
        struct wl_resource *c_res = NULL;
        struct wl_client *wl_client;
@@ -282,11 +282,11 @@ _waylend_tbm_monitor_server_list(struct wayland_tbm_monitore_request *r)
 }
 
 static void
-_waylend_tbm_monitor_server_show(struct wayland_tbm_monitore_request *r)
+_wayland_tbm_monitor_server_show(struct wayland_tbm_monitore_request *r)
 {
        struct wayland_tbm_monitor_target target = {0};
 
-       if (!_waylend_tbm_util_target_parse(r->argv[1], &target)) {
+       if (!_wayland_tbm_util_target_parse(r->argv[1], &target)) {
                _wayland_tbm_monitor_request_printf(r, "'%s' - unknown target for -show\n", r->argv[1]);
                return;
        }
@@ -332,7 +332,7 @@ _waylend_tbm_monitor_server_show(struct wayland_tbm_monitore_request *r)
 }
 
 static void
-_waylend_tbm_monitor_server_trace(struct wayland_tbm_monitore_request *r)
+_wayland_tbm_monitor_server_trace(struct wayland_tbm_monitore_request *r)
 {
 
        struct wayland_tbm_monitor_target target = {.all = 1, .server = 1, .pid = {0} };
@@ -340,7 +340,7 @@ _waylend_tbm_monitor_server_trace(struct wayland_tbm_monitore_request *r)
        WL_TBM_MONITOR_RES res;
        int st;
 
-       cmd = _waylend_tbm_util_proc_state_parse(r->argv[1]);
+       cmd = _wayland_tbm_util_proc_state_parse(r->argv[1]);
 
        if (cmd == WL_TBM_MONITOR_PROC_STATE_UNKNOWN) {
                _wayland_tbm_monitor_request_printf(r, "'%s' - unknown command for -trace\n", r->argv[1]);
@@ -348,20 +348,20 @@ _waylend_tbm_monitor_server_trace(struct wayland_tbm_monitore_request *r)
                return;
        }
 
-       res = _waylend_tbm_util_resource_parse(r->argv[2]);
+       res = _wayland_tbm_util_resource_parse(r->argv[2]);
        if (res == WL_TBM_MONITOR_RES_UNKNOWN) {
                _wayland_tbm_monitor_request_printf(r, "'%s' - unknown resource for -trace\n", r->argv[2]);
                _wayland_tbm_monitor_server_usage(r);
                return;
        }
 
-       if (!_waylend_tbm_util_target_parse(r->argv[3], &target)) {
+       if (!_wayland_tbm_util_target_parse(r->argv[3], &target)) {
                _wayland_tbm_monitor_request_printf(r, "'%s' - unknown target for -trace\n", r->argv[3]);
                return;
        }
 
        if (target.server) {
-               st = _waylend_tbm_util_trace(cmd, res, r->tbm_srv->bufmgr);
+               st = _wayland_tbm_util_trace(cmd, res, r->tbm_srv->bufmgr);
                _wayland_tbm_monitor_request_printf(r, "server: trace state: %s\n", st ? "on" : "off");
        }
 
@@ -369,7 +369,7 @@ _waylend_tbm_monitor_server_trace(struct wayland_tbm_monitore_request *r)
 }
 
 static void
-_waylend_tbm_monitor_server_dump_snapshot(struct wayland_tbm_monitore_request *r)
+_wayland_tbm_monitor_server_dump_snapshot(struct wayland_tbm_monitore_request *r)
 {
        struct wayland_tbm_monitor_target target = {.all = 1, .server = 1, .pid = {0} };
        double scale = 0;
@@ -377,9 +377,9 @@ _waylend_tbm_monitor_server_dump_snapshot(struct wayland_tbm_monitore_request *r
        char *path = NULL;
 
        for (i = 1; i < r->argc; i++) {
-               if (_waylend_tbm_util_target_parse(r->argv[i], &target))
+               if (_wayland_tbm_util_target_parse(r->argv[i], &target))
                        continue;
-               if (_waylend_tbm_util_scale_parse(r->argv[i], &scale))
+               if (_wayland_tbm_util_scale_parse(r->argv[i], &scale))
                        continue;
 
                _wayland_tbm_monitor_request_printf(r, "'%s' - unknown target or scale for -dump_snapshot\n", r->argv[2]);
@@ -389,7 +389,7 @@ _waylend_tbm_monitor_server_dump_snapshot(struct wayland_tbm_monitore_request *r
 
        if (target.server) {
                path = _wayland_tbm_dump_directory_make();
-               _waylend_tbm_util_dump_snapshot(r->tbm_srv->bufmgr, scale, path);
+               _wayland_tbm_util_dump_snapshot(r->tbm_srv->bufmgr, scale, path);
                _wayland_tbm_monitor_request_printf(r, "server: snapshot dump is done. path=%s\n", path);
                free(path);
        }
@@ -397,7 +397,7 @@ _waylend_tbm_monitor_server_dump_snapshot(struct wayland_tbm_monitore_request *r
 }
 
 static void
-_waylend_tbm_monitor_server_dump_queue(struct wayland_tbm_monitore_request *r)
+_wayland_tbm_monitor_server_dump_queue(struct wayland_tbm_monitore_request *r)
 {
        struct wayland_tbm_monitor_target target = {.all = 1, .server = 1, .pid = {0} };
        WL_TBM_MONITOR_PROC_STATE cmd;
@@ -405,7 +405,7 @@ _waylend_tbm_monitor_server_dump_queue(struct wayland_tbm_monitore_request *r)
        int st = 0;
        int i;
 
-       cmd = _waylend_tbm_util_proc_state_parse(r->argv[1]);
+       cmd = _wayland_tbm_util_proc_state_parse(r->argv[1]);
        if (cmd == WL_TBM_MONITOR_PROC_STATE_UNKNOWN) {
                _wayland_tbm_monitor_request_printf(r, "'%s' - unknown command for -dump_queue\n", r->argv[1]);
                _wayland_tbm_monitor_server_usage(r);
@@ -413,9 +413,9 @@ _waylend_tbm_monitor_server_dump_queue(struct wayland_tbm_monitore_request *r)
        }
 
        for (i = 2; i < r->argc; i++) {
-               if (_waylend_tbm_util_target_parse(r->argv[i], &target))
+               if (_wayland_tbm_util_target_parse(r->argv[i], &target))
                        continue;
-               if (_waylend_tbm_util_scale_parse(r->argv[i], &scale))
+               if (_wayland_tbm_util_scale_parse(r->argv[i], &scale))
                        continue;
 
                _wayland_tbm_monitor_request_printf(r, "'%s' - unknown target or scale for -dump_queue\n", r->argv[2]);
@@ -424,23 +424,23 @@ _waylend_tbm_monitor_server_dump_queue(struct wayland_tbm_monitore_request *r)
        }
 
        if (target.server) {
-               st = _waylend_tbm_util_dump_queue(cmd, r->tbm_srv->bufmgr, scale);
+               st = _wayland_tbm_util_dump_queue(cmd, r->tbm_srv->bufmgr, scale);
                _wayland_tbm_monitor_request_printf(r, "server: queue dump state: %s\n", st ? "on" : "off");
        }
        _send_request_to_client_with_wait(r, &target, 1);
 }
 
 static void
-_waylend_tbm_monitor_server_debug_level(struct wayland_tbm_monitore_request *r)
+_wayland_tbm_monitor_server_debug_level(struct wayland_tbm_monitore_request *r)
 {
        struct wayland_tbm_monitor_target target = {.all = 1, .server = 1, .pid = {0} };
        int debug_level = TBM_LOG_LEVEL_NONE;
        int i;
 
        for (i = 1; i < r->argc; i++) {
-               if (_waylend_tbm_util_target_parse(r->argv[i], &target))
+               if (_wayland_tbm_util_target_parse(r->argv[i], &target))
                        continue;
-               if (_waylend_tbm_util_debug_level_parse(r->argv[i], &debug_level))
+               if (_wayland_tbm_util_debug_level_parse(r->argv[i], &debug_level))
                        continue;
 
                _wayland_tbm_monitor_request_printf(r, "'%s' - unknown target or debug_level for -log_level\n", r->argv[2]);
@@ -449,7 +449,7 @@ _waylend_tbm_monitor_server_debug_level(struct wayland_tbm_monitore_request *r)
        }
 
        if (target.server) {
-               _waylend_tbm_util_set_log_level(debug_level);
+               _wayland_tbm_util_set_log_level(debug_level);
                _wayland_tbm_monitor_request_printf(r, "server: set tbm_log debug_level(%d)\n", debug_level);
        }
        _send_request_to_client_with_wait(r, &target, 1);
@@ -464,7 +464,7 @@ static struct {
 } option_proc[] = {
        {
                "list",
-               _waylend_tbm_monitor_server_list,
+               _wayland_tbm_monitor_server_list,
                "get list of tbm clients",
                NULL, /*args*/
                "\n"
@@ -472,7 +472,7 @@ static struct {
        },
        {
                "show",
-               _waylend_tbm_monitor_server_show,
+               _wayland_tbm_monitor_server_show,
                "print all tbm_surface/tbm_bo information for (all | server,<pid>,... ) to path (console | dlog | <filepath>)"
                ,
                "<target> [<path>]\n"
@@ -487,7 +487,7 @@ static struct {
        },
        {
                "trace",
-               _waylend_tbm_monitor_server_trace,
+               _wayland_tbm_monitor_server_trace,
                "trace the changes or the information of the tbm resources (command: on | off | status)\n"
                "\t\t the trace log is shown through the dlog message with \"TBM\" tag."
                ,
@@ -512,7 +512,7 @@ static struct {
        },
        {
                "dump_snapshot",
-               _waylend_tbm_monitor_server_dump_snapshot,
+               _wayland_tbm_monitor_server_dump_snapshot,
                "make dumps of all tbm_surfaces for (all | server,<pid>,... ) with scale"
                ,
                "[<target>] [<scale>]\n"
@@ -526,7 +526,7 @@ static struct {
        },
        {
                "dump_queue",
-               _waylend_tbm_monitor_server_dump_queue,
+               _wayland_tbm_monitor_server_dump_queue,
                "make dumps for the tbm_surfaces which are queued with scale"
                ,
                "<cmd> [<target>] [<scale>]\n"
@@ -545,7 +545,7 @@ static struct {
        },
        {
                "debug_level",
-               _waylend_tbm_monitor_server_debug_level,
+               _wayland_tbm_monitor_server_debug_level,
                "set the debug level of the TBM"
                ,
                "[<target>] <debug_level>\n"

diff --git a/src/wayland-tbm-util.c b/src/wayland-tbm-util.c
index 3e9a8e0..42fd0d1 100644 (file)
--- a/src/wayland-tbm-util.c
+++ b/src/wayland-tbm-util.c
@@ -70,7 +70,7 @@ _str_to_pid(char * pid_str)
 }
 
 int
-_waylend_tbm_util_target_parse(char * target_str, struct wayland_tbm_monitor_target *target)
+_wayland_tbm_util_target_parse(char * target_str, struct wayland_tbm_monitor_target *target)
 {
        char *t = NULL;
        char *end = target_str;
@@ -103,7 +103,7 @@ _waylend_tbm_util_target_parse(char * target_str, struct wayland_tbm_monitor_tar
 }
 
 int
-_waylend_tbm_util_scale_parse(char * scale_str, double *scale)
+_wayland_tbm_util_scale_parse(char * scale_str, double *scale)
 {
        if (!scale_str)
                return 1;
@@ -116,7 +116,7 @@ _waylend_tbm_util_scale_parse(char * scale_str, double *scale)
 }
 
 int
-_waylend_tbm_util_debug_level_parse(char * str, int *debug_level)
+_wayland_tbm_util_debug_level_parse(char * str, int *debug_level)
 {
        if (!str)
                return 0;
@@ -136,7 +136,7 @@ _waylend_tbm_util_debug_level_parse(char * str, int *debug_level)
 }
 
 WL_TBM_MONITOR_PROC_STATE
-_waylend_tbm_util_proc_state_parse(char *str)
+_wayland_tbm_util_proc_state_parse(char *str)
 {
        if (str == NULL)
                return WL_TBM_MONITOR_PROC_STATE_UNKNOWN;
@@ -150,7 +150,7 @@ _waylend_tbm_util_proc_state_parse(char *str)
 }
 
 WL_TBM_MONITOR_RES
-_waylend_tbm_util_resource_parse(char * str)
+_wayland_tbm_util_resource_parse(char * str)
 {
        if (str == NULL)
                return WL_TBM_MONITOR_RES_UNKNOWN;
@@ -201,7 +201,7 @@ _wayland_tbm_util_show_path_parse(char * path_str, char * cwd, struct wayland_tb
 
 
 int
-_waylend_tbm_util_trace(WL_TBM_MONITOR_PROC_STATE cmd, WL_TBM_MONITOR_RES res, tbm_bufmgr bufmgr)
+_wayland_tbm_util_trace(WL_TBM_MONITOR_PROC_STATE cmd, WL_TBM_MONITOR_RES res, tbm_bufmgr bufmgr)
 {
        int ret = 0;
 
@@ -248,7 +248,7 @@ _waylend_tbm_util_trace(WL_TBM_MONITOR_PROC_STATE cmd, WL_TBM_MONITOR_RES res, t
        return ret;
 }
 void
-_waylend_tbm_util_dump_snapshot(tbm_bufmgr bufmgr, double scale, char *path)
+_wayland_tbm_util_dump_snapshot(tbm_bufmgr bufmgr, double scale, char *path)
 {
        if (path) {
                tbm_bufmgr_debug_dump_set_scale(scale);
@@ -257,7 +257,7 @@ _waylend_tbm_util_dump_snapshot(tbm_bufmgr bufmgr, double scale, char *path)
 }
 
 int
-_waylend_tbm_util_dump_queue(WL_TBM_MONITOR_PROC_STATE cmd, tbm_bufmgr bufmgr, double scale)
+_wayland_tbm_util_dump_queue(WL_TBM_MONITOR_PROC_STATE cmd, tbm_bufmgr bufmgr, double scale)
 {
        static char *path = NULL;
 
@@ -376,7 +376,7 @@ _wayland_tbm_dump_directory_make(void)
 }
 
 void
-_waylend_tbm_util_set_log_level(int level)
+_wayland_tbm_util_set_log_level(int level)
 {
        tbm_log_set_debug_level(level);
 }