From mboxrd@z Thu Jan 1 00:00:00 1970 From: Harmandeep Kaur Subject: [PATCH 7/9] xl: Improve return and exit codes of main_create(), main_config_update(), main_sharing(), main_rename() and related functions. Date: Wed, 24 Feb 2016 18:23:25 +0530 Message-ID: <1456318407-3635-8-git-send-email-write.harmandeep@gmail.com> References: <1456318407-3635-1-git-send-email-write.harmandeep@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aYYxh-0008Cu-Jh for xen-devel@lists.xenproject.org; Wed, 24 Feb 2016 12:54:37 +0000 Received: by mail-pf0-f194.google.com with SMTP id e127so915073pfe.3 for ; Wed, 24 Feb 2016 04:54:35 -0800 (PST) In-Reply-To: <1456318407-3635-1-git-send-email-write.harmandeep@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: wei.liu2@citrix.com, ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, Harmandeep Kaur List-Id: xen-devel@lists.xenproject.org Signed-off-by: Harmandeep Kaur --- tools/libxl/xl_cmdimpl.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 9d95b50..f7f7d7f 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5001,7 +5001,7 @@ static void string_realloc_append(char **accumulate, const char *more) size_t morelen = strlen(more) + 1/*nul*/; if (oldlen > SSIZE_MAX || morelen > SSIZE_MAX - oldlen) { fprintf(stderr,"Additional config data far too large\n"); - exit(-ERROR_FAIL); + exit(EXIT_FAILURE); } *accumulate = xrealloc(*accumulate, oldlen + morelen); @@ -5076,7 +5076,7 @@ int main_create(int argc, char **argv) } else { help("create"); free(dom_info.extra_config); - return 2; + return EXIT_FAILURE; } } @@ -5095,11 +5095,11 @@ int main_create(int argc, char **argv) rc = create_domain(&dom_info); if (rc < 0) { free(dom_info.extra_config); - return -rc; + return EXIT_FAILURE; } free(dom_info.extra_config); - return 0; + return EXIT_SUCCESS; } int main_config_update(int argc, char **argv) @@ -5120,7 +5120,7 @@ int main_config_update(int argc, char **argv) if (argc < 2) { fprintf(stderr, "xl config-update requires a domain argument\n"); help("config-update"); - exit(1); + exit(EXIT_FAILURE); } fprintf(stderr, "WARNING: xl now has better capability to manage domain configuration, " @@ -5152,7 +5152,7 @@ int main_config_update(int argc, char **argv) } else { help("create"); free(extra_config); - return 2; + return EXIT_FAILURE; } } if (filename) { @@ -5161,25 +5161,25 @@ int main_config_update(int argc, char **argv) &config_data, &config_len); if (rc) { fprintf(stderr, "Failed to read config file: %s: %s\n", filename, strerror(errno)); - free(extra_config); return ERROR_FAIL; } + free(extra_config); return EXIT_FAILURE; } if (extra_config && strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) { fprintf(stderr, "Failed to attach extra configuration\n"); - exit(1); + exit(EXIT_FAILURE); } /* allocate space for the extra config plus two EOLs plus \0 */ config_data = realloc(config_data, config_len + strlen(extra_config) + 2 + 1); if (!config_data) { fprintf(stderr, "Failed to realloc config_data\n"); - exit(1); + exit(EXIT_FAILURE); } config_len += sprintf(config_data + config_len, "\n%s\n", extra_config); } } else { fprintf(stderr, "Config file not specified\n"); - exit(1); + exit(EXIT_FAILURE); } libxl_domain_config_init(&d_config); @@ -5195,7 +5195,7 @@ int main_config_update(int argc, char **argv) config_data, config_len); if (rc) { fprintf(stderr, "failed to update configuration\n"); - exit(1); + exit(EXIT_FAILURE); } } @@ -5203,7 +5203,7 @@ int main_config_update(int argc, char **argv) free(config_data); free(extra_config); - return 0; + return EXIT_SUCCESS; } static void button_press(uint32_t domid, const char *b) @@ -5772,7 +5772,7 @@ int main_sharing(int argc, char **argv) info = libxl_list_domain(ctx, &nb_domain); if (!info) { fprintf(stderr, "libxl_list_domain failed.\n"); - return 1; + return EXIT_FAILURE; } info_free = info; } else if (optind == argc-1) { @@ -5781,17 +5781,17 @@ int main_sharing(int argc, char **argv) if (rc == ERROR_DOMAIN_NOTFOUND) { fprintf(stderr, "Error: Domain \'%s\' does not exist.\n", argv[optind]); - return -rc; + return EXIT_FAILURE; } if (rc) { fprintf(stderr, "libxl_domain_info failed (code %d).\n", rc); - return -rc; + return EXIT_FAILURE; } info = &info_buf; nb_domain = 1; } else { help("sharing"); - return 2; + return EXIT_FAILURE; } sharing(info, nb_domain); @@ -5801,7 +5801,7 @@ int main_sharing(int argc, char **argv) else libxl_dominfo_dispose(info); - return 0; + return EXIT_SUCCESS; } static int sched_domain_get(libxl_scheduler sched, int domid, @@ -6374,10 +6374,10 @@ int main_rename(int argc, char **argv) domid = find_domain(dom); if (libxl_domain_rename(ctx, domid, common_domname, new_name)) { fprintf(stderr, "Can't rename domain '%s'.\n", dom); - return 1; + return EXIT_FAILURE; } - return 0; + return EXIT_SUCCESS; } int main_trigger(int argc, char **argv) -- 2.5.0