From: shingil.kang Date: Mon, 19 Dec 2016 09:50:09 +0000 (+0900) Subject: Refined user message X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd6d76eb4ddba98532d370153af1df4e17a7f1a7;p=sdk%2Ftools%2Fsdb.git Refined user message Change-Id: I42170f3cad1216d5a6df1a3c806025befca378c5 Signed-off-by: shingil.kang --- diff --git a/src/sdb_client.c b/src/sdb_client.c index 6da4f00..f5fca34 100644 --- a/src/sdb_client.c +++ b/src/sdb_client.c @@ -352,7 +352,7 @@ int sdb_connect_getfailmsg(const char *service, char** pp_failmsg) if ((server_major != SDB_VERSION_MAJOR) || (server_minor != SDB_VERSION_MINOR) || (server_patch != SDB_VERSION_PATCH)) { - fprintf(stderr, "* The version of SDB client (%d.%d.%d) is not same with that of SDB server (%d.%d.%d).\n It may cause version compatibility problems.\n It is recommended to use SDB server with version %d.%d.%d. *\n", SDB_VERSION_MAJOR, SDB_VERSION_MINOR, SDB_VERSION_PATCH, server_major, server_minor, server_patch, SDB_VERSION_MAJOR, SDB_VERSION_MINOR, SDB_VERSION_PATCH); + fprintf(stderr, "* The version of SDB client (%d.%d.%d) and server (%d.%d.%d) are different.\n This may cause version compatibility problems.\n It is recommended to use SDB server %d.%d.%d. *\n", SDB_VERSION_MAJOR, SDB_VERSION_MINOR, SDB_VERSION_PATCH, server_major, server_minor, server_patch, SDB_VERSION_MAJOR, SDB_VERSION_MINOR, SDB_VERSION_PATCH); } } else { int ver = 0; @@ -381,7 +381,7 @@ int sdb_connect_getfailmsg(const char *service, char** pp_failmsg) } if(fd == -2) { - fprintf(stdout,"* server not running. starting it now on port %d *\n", DEFAULT_SDB_PORT); + fprintf(stdout,"* Server is not running. Start it now on port %d *\n", DEFAULT_SDB_PORT); launch_server: if (!strcmp(service, "host:start-server:only-detect-tizen")) only_detect_tizen_device = 1; @@ -391,7 +391,7 @@ launch_server: print_error(SDB_MESSAGE_ERROR, ERR_GENERAL_START_SERVER_FAIL, NULL); return -1; } else { - fprintf(stdout,"* server started successfully *\n"); + fprintf(stdout,"* Server has started successfully *\n"); } } diff --git a/src/sdb_messages.c b/src/sdb_messages.c index b3080d5..eb087c0 100644 --- a/src/sdb_messages.c +++ b/src/sdb_messages.c @@ -35,7 +35,7 @@ const char* ERR_GENERAL_INVALID_SERVICE_NAME = "invalid service name"; const char* ERR_GENERAL_WRITE_MESSAGE_SIZE_FAIL = "failed to write message size"; const char* ERR_GENERAL_INVALID_PORT = "invalid port '%s'"; const char* ERR_GENERAL_START_SERVER_FAIL = "failed to start server"; -const char* ERR_GENERAL_SERVER_NOT_RUN = "server not running"; +const char* ERR_GENERAL_SERVER_NOT_RUN = "Server is not running"; const char* ERR_GENERAL_LOG_FAIL = "failed to log"; const char* ERR_GENERAL_DUPLICATE_FAIL = "failed to duplicate '%s'"; const char* ERR_GENERAL_LAUNCH_APP_FAIL = "failed to launch application"; @@ -65,7 +65,7 @@ const char* ERR_SYNC_NOT_EXIST_FILE = "'%s' does not exist"; const char* ERR_SYNC_NOT_DIRECTORY = "'%s' is not a directory"; const char* ERR_SYNC_LOCKED = "'%s' is locked"; const char* ERR_SYNC_CANNOT_ACCESS = "cannot access '%s'"; -const char* MSG_SYNC_SECURE_WARNING = "WARNING: Your data is to be sent over an unencrypted connection and could be read by others."; +const char* MSG_SYNC_SECURE_WARNING = "WARNING: Your data are to be sent over an unencrypted connection and could be read by others."; const char* ERR_CONNECT_MORE_THAN_ONE_TARGET = "more than one target found. Specify the target with -s option."; const char* ERR_CONNECT_MORE_THAN_ONE_EMUL = "more than one emulator found. Specify the emulator with -e option.";