From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 11 Dec 2019 12:48:32 +0000 (+0100)
Subject: vsh: remove vshErrorOOM
X-Git-Tag: v6.0.0-rc1~341
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=997340588b88b1fc58d6843353d64a0106d41f83;p=thirdparty%2Flibvirt.git

vsh: remove vshErrorOOM

We abort on allocation errors now so there is no need to
have a function for it.

Replace the only use by return -1, chosen by fair dice roll.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/tools/vsh.c b/tools/vsh.c
index 6c78a7a373..dd2c039b47 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -64,17 +64,6 @@ const vshCmdGrp *cmdGroups;
 const vshCmdDef *cmdSet;
 
 
-/* simple handler for oom conditions */
-static void
-vshErrorOOM(void)
-{
-    fflush(stdout);
-    fputs(_("error: Out of memory\n"), stderr);
-    fflush(stderr);
-    exit(EXIT_FAILURE);
-}
-
-
 double
 vshPrettyCapacity(unsigned long long val, const char **unit)
 {
@@ -361,7 +350,7 @@ vshCmddefCheckInternals(vshControl *ctl,
             }
             if ((p = strchr(name, '=')) &&
                 VIR_STRNDUP(name, name, p - name) < 0)
-                vshErrorOOM();
+                return -1;
             for (j = i + 1; cmd->opts[j].name; j++) {
                 if (STREQ(name, cmd->opts[j].name) &&
                     cmd->opts[j].type != VSH_OT_ALIAS)