[libvirt] [PATCH 0/2] virsh: Change command option parsing
This series changes some of vshCommandOpt* functions to return tri-state result according to cases if argument was found and valid and permutations. In addition, we ensure const-correctness of vshCommandOptString function and related code. Michal Privoznik (2): virsh: change vshCommandOptString return type and fix const-correctness virsh: Change option parsing functions to return tri-state information. tools/virsh.c | 717 +++++++++++++++++++++++++++------------------------------ 1 files changed, 335 insertions(+), 382 deletions(-) -- 1.7.4
This function should return pointer to const, because we don't want to change command option value. Therfore we can ensure const-correcntess. --- tools/virsh.c | 232 +++++++++++++++++++++++++++++---------------------------- 1 files changed, 119 insertions(+), 113 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index f3754d7..6ad4089 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -255,7 +255,7 @@ static vshCmdOpt *vshCommandOpt(const vshCmd *cmd, const char *name); static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *found); static unsigned long vshCommandOptUL(const vshCmd *cmd, const char *name, int *found); -static char *vshCommandOptString(const vshCmd *cmd, const char *name, +static const char *vshCommandOptString(const vshCmd *cmd, const char *name, int *found); static long long vshCommandOptLongLong(const vshCmd *cmd, const char *name, int *found); @@ -268,14 +268,14 @@ static char *vshCommandOptArgv(const vshCmd *cmd, int count); #define VSH_BYMAC (1 << 4) static virDomainPtr vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, - char **name, int flag); + const char **name, int flag); /* default is lookup by Id, Name and UUID */ #define vshCommandOptDomain(_ctl, _cmd, _name) \ vshCommandOptDomainBy(_ctl, _cmd, _name, VSH_BYID|VSH_BYUUID|VSH_BYNAME) static virNetworkPtr vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, - char **name, int flag); + const char **name, int flag); /* default is lookup by Name and UUID */ #define vshCommandOptNetwork(_ctl, _cmd, _name) \ @@ -283,7 +283,7 @@ static virNetworkPtr vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, VSH_BYUUID|VSH_BYNAME) static virNWFilterPtr vshCommandOptNWFilterBy(vshControl *ctl, const vshCmd *cmd, - char **name, int flag); + const char **name, int flag); /* default is lookup by Name and UUID */ #define vshCommandOptNWFilter(_ctl, _cmd, _name) \ @@ -291,7 +291,7 @@ static virNWFilterPtr vshCommandOptNWFilterBy(vshControl *ctl, const vshCmd *cmd VSH_BYUUID|VSH_BYNAME) static virInterfacePtr vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, - char **name, int flag); + const char **name, int flag); /* default is lookup by Name and MAC */ #define vshCommandOptInterface(_ctl, _cmd, _name) \ @@ -299,7 +299,7 @@ static virInterfacePtr vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *c VSH_BYMAC|VSH_BYNAME) static virStoragePoolPtr vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, - const char *optname, char **name, int flag); + const char *optname, const char **name, int flag); /* default is lookup by Name and UUID */ #define vshCommandOptPool(_ctl, _cmd, _optname, _name) \ @@ -309,7 +309,7 @@ static virStoragePoolPtr vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, static virStorageVolPtr vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, const char *pooloptname, - char **name, int flag); + const char **name, int flag); /* default is lookup by Name and UUID */ #define vshCommandOptVol(_ctl, _cmd, _optname, _pooloptname, _name) \ @@ -317,7 +317,7 @@ static virStorageVolPtr vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, VSH_BYUUID|VSH_BYNAME) static virSecretPtr vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, - char **name); + const char **name); static void vshPrintExtra(vshControl *ctl, const char *format, ...) ATTRIBUTE_FMT_PRINTF(2, 3); @@ -643,7 +643,7 @@ static int cmdAutostart(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - char *name; + const char *name; int autostart; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -692,7 +692,7 @@ static int cmdConnect(vshControl *ctl, const vshCmd *cmd) { int ro = vshCommandOptBool(cmd, "readonly"); - char *name; + const char *name; if (ctl->conn) { int ret; @@ -964,7 +964,7 @@ static int cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - char *name, *device; + const char *name, *device; struct _virDomainBlockStats stats; if (!vshConnectionUsability (ctl, ctl->conn)) @@ -1021,7 +1021,7 @@ static int cmdDomIfstat (vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - char *name, *device; + const char *name, *device; struct _virDomainInterfaceStats stats; if (!vshConnectionUsability (ctl, ctl->conn)) @@ -1087,7 +1087,7 @@ static int cmdDomMemStat(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - char *name; + const char *name; struct _virDomainMemoryStat stats[VIR_DOMAIN_MEMORY_STAT_NR]; unsigned int nr_stats, i; @@ -1188,7 +1188,7 @@ static int cmdSuspend(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - char *name; + const char *name; int ret = TRUE; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -1230,7 +1230,7 @@ static int cmdCreate(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - char *from; + const char *from; int found; int ret = TRUE; char *buffer; @@ -1288,7 +1288,7 @@ static int cmdDefine(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - char *from; + const char *from; int found; int ret = TRUE; char *buffer; @@ -1336,7 +1336,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int ret = TRUE; - char *name; + const char *name; int found; int id; @@ -1454,8 +1454,8 @@ static int cmdSave(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - char *name; - char *to; + const char *name; + const char *to; int ret = TRUE; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -1499,7 +1499,7 @@ static int cmdManagedSave(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - char *name; + const char *name; int ret = TRUE; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -1537,7 +1537,7 @@ static int cmdManagedSaveRemove(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - char *name; + const char *name; int ret = FALSE; int hassave; @@ -1595,7 +1595,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd, virSchedParameterPtr param) { int found; - char *data; + const char *data; /* Legacy 'weight' parameter */ if (STREQ(param->field, "weight") && @@ -1746,7 +1746,7 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) /* See if we've tried to --set var=val. If so, the fact that we reach this point (with update == 0) means that "var" did not match any of the settable parameters. Report the error. */ - char *var_value_pair = vshCommandOptString(cmd, "set", NULL); + const char *var_value_pair = vshCommandOptString(cmd, "set", NULL); if (var_value_pair) { vshError(ctl, _("invalid scheduler option: %s"), var_value_pair); @@ -1804,7 +1804,7 @@ static const vshCmdOptDef opts_restore[] = { static int cmdRestore(vshControl *ctl, const vshCmd *cmd) { - char *from; + const char *from; int found; int ret = TRUE; @@ -1845,8 +1845,8 @@ static int cmdDump(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - char *name; - char *to; + const char *name; + const char *to; int ret = TRUE; int flags = 0; @@ -1894,7 +1894,7 @@ cmdResume(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -1932,7 +1932,7 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -1970,7 +1970,7 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -2008,7 +2008,7 @@ cmdDestroy(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -2412,7 +2412,7 @@ static const vshCmdOptDef opts_maxvcpus[] = { static int cmdMaxvcpus(vshControl *ctl, const vshCmd *cmd) { - char *type; + const char *type; int vcpus; type = vshCommandOptString(cmd, "type", NULL); @@ -2712,7 +2712,7 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; virNodeInfo nodeinfo; int vcpu; - char *cpulist; + const char *cpulist; int ret = TRUE; int vcpufound = 0; unsigned char *cpumap; @@ -3315,8 +3315,8 @@ static int cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd) { int ret = TRUE; - char *format; - char *configFile; + const char *format; + const char *configFile; char *configData; char *xmlData; int flags = 0; @@ -3360,8 +3360,8 @@ static int cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) { int ret = TRUE; - char *format; - char *xmlFile; + const char *format; + const char *xmlFile; char *configData; char *xmlData; int flags = 0; @@ -3843,7 +3843,7 @@ static int cmdNetworkAutostart(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; - char *name; + const char *name; int autostart; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -3890,7 +3890,7 @@ static int cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; - char *from; + const char *from; int found; int ret = TRUE; char *buffer; @@ -3938,7 +3938,7 @@ static int cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; - char *from; + const char *from; int found; int ret = TRUE; char *buffer; @@ -3987,7 +3987,7 @@ cmdNetworkDestroy(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -4418,7 +4418,7 @@ cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -4711,7 +4711,7 @@ static int cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) { virInterfacePtr iface; - char *from; + const char *from; int found; int ret = TRUE; char *buffer; @@ -4759,7 +4759,7 @@ cmdInterfaceUndefine(vshControl *ctl, const vshCmd *cmd) { virInterfacePtr iface; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -4797,7 +4797,7 @@ cmdInterfaceStart(vshControl *ctl, const vshCmd *cmd) { virInterfacePtr iface; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -4835,7 +4835,7 @@ cmdInterfaceDestroy(vshControl *ctl, const vshCmd *cmd) { virInterfacePtr iface; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -4873,7 +4873,7 @@ static int cmdNWFilterDefine(vshControl *ctl, const vshCmd *cmd) { virNWFilterPtr nwfilter; - char *from; + const char *from; int found; int ret = TRUE; char *buffer; @@ -4922,7 +4922,7 @@ cmdNWFilterUndefine(vshControl *ctl, const vshCmd *cmd) { virNWFilterPtr nwfilter; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -5166,7 +5166,7 @@ static int cmdPoolAutostart(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; - char *name; + const char *name; int autostart; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -5214,7 +5214,7 @@ static int cmdPoolCreate(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; - char *from; + const char *from; int found; int ret = TRUE; char *buffer; @@ -5266,7 +5266,7 @@ static int cmdNodeDeviceCreate(vshControl *ctl, const vshCmd *cmd) { virNodeDevicePtr dev = NULL; - char *from; + const char *from; int found = 0; int ret = TRUE; char *buffer; @@ -5320,7 +5320,7 @@ cmdNodeDeviceDestroy(vshControl *ctl, const vshCmd *cmd) virNodeDevicePtr dev = NULL; int ret = TRUE; int found = 0; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) { return FALSE; @@ -5361,10 +5361,10 @@ static const vshCmdOptDef opts_pool_X_as[] = { {NULL, 0, 0, NULL} }; -static int buildPoolXML(const vshCmd *cmd, char **retname, char **xml) { +static int buildPoolXML(const vshCmd *cmd, const char **retname, char **xml) { int found; - char *name, *type, *srcHost, *srcPath, *srcDev, *srcName, *srcFormat, *target; + const char *name, *type, *srcHost, *srcPath, *srcDev, *srcName, *srcFormat, *target; virBuffer buf = VIR_BUFFER_INITIALIZER; name = vshCommandOptString(cmd, "name", &found); @@ -5433,7 +5433,8 @@ static int cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; - char *xml, *name; + const char *name; + char *xml; int printXML = vshCommandOptBool(cmd, "print-xml"); if (!vshConnectionUsability(ctl, ctl->conn)) @@ -5479,7 +5480,7 @@ static int cmdPoolDefine(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; - char *from; + const char *from; int found; int ret = TRUE; char *buffer; @@ -5522,7 +5523,8 @@ static int cmdPoolDefineAs(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; - char *xml, *name; + const char *name; + char *xml; int printXML = vshCommandOptBool(cmd, "print-xml"); if (!vshConnectionUsability(ctl, ctl->conn)) @@ -5569,7 +5571,7 @@ cmdPoolBuild(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -5609,7 +5611,7 @@ cmdPoolDestroy(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -5648,7 +5650,7 @@ cmdPoolDelete(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -5687,7 +5689,7 @@ cmdPoolRefresh(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -6176,10 +6178,10 @@ static const vshCmdOptDef opts_find_storage_pool_sources_as[] = { static int cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED) { - char *type, *host; + const char *type, *host; char *srcSpec = NULL; char *srcList; - char *initiator; + const char *initiator; int found; type = vshCommandOptString(cmd, "type", &found); @@ -6196,7 +6198,7 @@ cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED) return FALSE; if (host) { - char *port = vshCommandOptString(cmd, "port", &found); + const char *port = vshCommandOptString(cmd, "port", &found); if (!found) port = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -6251,8 +6253,8 @@ static const vshCmdOptDef opts_find_storage_pool_sources[] = { static int cmdPoolDiscoverSources(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED) { - char *type, *srcSpecFile, *srcList; - char *srcSpec = NULL; + const char *type, *srcSpecFile; + char *srcSpec = NULL, *srcList; int found; type = vshCommandOptString(cmd, "type", &found); @@ -6503,8 +6505,8 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) virStorageVolPtr vol; int found; char *xml; - char *name, *capacityStr, *allocationStr, *format; - char *snapshotStrVol, *snapshotStrFormat; + const char *name, *capacityStr, *allocationStr, *format; + const char *snapshotStrVol, *snapshotStrFormat; unsigned long long capacity, allocation = 0; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -6646,7 +6648,7 @@ cmdPoolUndefine(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -6723,7 +6725,7 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; virStorageVolPtr vol; - char *from; + const char *from; int found; int ret = TRUE; char *buffer; @@ -6784,7 +6786,7 @@ cmdVolCreateFrom(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool = NULL; virStorageVolPtr newvol = NULL, inputvol = NULL; - char *from; + const char *from; int found; int ret = FALSE; char *buffer = NULL; @@ -6831,7 +6833,7 @@ cleanup: } static xmlChar * -makeCloneXML(char *origxml, char *newname) { +makeCloneXML(const char *origxml, const char *newname) { xmlDocPtr doc = NULL; xmlXPathContextPtr ctxt = NULL; @@ -6883,7 +6885,8 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr origpool = NULL; virStorageVolPtr origvol = NULL, newvol = NULL; - char *name, *origxml = NULL; + const char *name; + char *origxml = NULL; xmlChar *newxml = NULL; int found; int ret = FALSE; @@ -6959,7 +6962,7 @@ cmdVolDelete(vshControl *ctl, const vshCmd *cmd) { virStorageVolPtr vol; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -7000,7 +7003,7 @@ cmdVolWipe(vshControl *ctl, const vshCmd *cmd) { virStorageVolPtr vol; int ret = TRUE; - char *name; + const char *name; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -7537,7 +7540,7 @@ static int cmdVolPath(vshControl *ctl, const vshCmd *cmd) { virStorageVolPtr vol; - char *name = NULL; + const char *name = NULL; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -7569,7 +7572,8 @@ static const vshCmdOptDef opts_secret_define[] = { static int cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) { - char *from, *buffer; + const char *from; + char *buffer; virSecretPtr res; char uuid[VIR_UUID_STRING_BUFLEN]; @@ -7660,7 +7664,8 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd) { virSecretPtr secret; size_t value_size; - char *base64, *value; + const char *base64; + char *value; int found, res, ret = FALSE; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -7770,7 +7775,7 @@ cmdSecretUndefine(vshControl *ctl, const vshCmd *cmd) { virSecretPtr secret; int ret = FALSE; - char *uuid; + const char *uuid; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -8036,7 +8041,7 @@ cmdNodeListDevicesPrint(vshControl *ctl, static int cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { - char *cap; + const char *cap; char **devices; int found, num_devices, i; int tree = vshCommandOptBool(cmd, "tree"); @@ -8516,7 +8521,7 @@ static int cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - char *from; + const char *from; char *buffer; int ret = TRUE; int found; @@ -8583,7 +8588,7 @@ static int cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - char *from; + const char *from; char *buffer; int ret = TRUE; int found; @@ -8651,7 +8656,7 @@ static int cmdUpdateDevice(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - char *from; + const char *from; char *buffer; int ret = TRUE; int found; @@ -8727,7 +8732,7 @@ static int cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; - char *mac, *target, *script, *type, *source, *model; + const char *mac, *target, *script, *type, *source, *model; int typ, ret = FALSE; unsigned int flags; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -8837,7 +8842,8 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) xmlXPathContextPtr ctxt = NULL; xmlNodePtr cur = NULL; xmlBufferPtr xml_buf = NULL; - char *doc, *mac =NULL, *type; + const char *mac =NULL, *type; + char *doc; char buf[64]; int i = 0, diff_mac, ret = FALSE; unsigned int flags; @@ -8976,10 +8982,10 @@ static int cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; - char *source, *target, *driver, *subdriver, *type, *mode; + const char *source, *target, *driver, *subdriver, *type, *mode; int isFile = 0, ret = FALSE; unsigned int flags; - char *stype; + const char *stype; virBuffer buf = VIR_BUFFER_INITIALIZER; char *xml; @@ -9104,7 +9110,8 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) xmlNodePtr cur = NULL; xmlBufferPtr xml_buf = NULL; virDomainPtr dom = NULL; - char *doc, *target; + const char *target; + char *doc; int i = 0, diff_tgt, ret = FALSE; unsigned int flags; @@ -9221,7 +9228,7 @@ static const vshCmdOptDef opts_cpu_compare[] = { static int cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) { - char *from; + const char *from; int found; int ret = TRUE; char *buffer; @@ -9285,7 +9292,7 @@ static const vshCmdOptDef opts_cpu_baseline[] = { static int cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) { - char *from; + const char *from; int found; int ret = TRUE; char *buffer; @@ -9517,9 +9524,9 @@ static int cmdCd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { const char *dir; + char *dir_malloced = NULL; int found; int ret = TRUE; - bool dir_malloced = false; if (!ctl->imode) { vshError(ctl, "%s", _("cd: command valid only in interactive mode")); @@ -9529,8 +9536,7 @@ cmdCd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) dir = vshCommandOptString(cmd, "dir", &found); if (!found) { uid_t uid = geteuid(); - dir = virGetUserDirectory(uid); - dir_malloced = !!dir; + dir = dir_malloced = virGetUserDirectory(uid); } if (!dir) dir = "/"; @@ -9541,7 +9547,7 @@ cmdCd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) } if (dir_malloced) - VIR_FREE(dir); + VIR_FREE(dir_malloced); return ret; } @@ -9830,7 +9836,7 @@ cmdSnapshotCreate(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; int ret = FALSE; - char *from; + const char *from; char *buffer = NULL; virDomainSnapshotPtr snapshot = NULL; xmlDocPtr xml = NULL; @@ -10103,7 +10109,7 @@ cmdSnapshotDumpXML(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; int ret = FALSE; - char *name; + const char *name; virDomainSnapshotPtr snapshot = NULL; char *xml = NULL; @@ -10160,7 +10166,7 @@ cmdDomainSnapshotRevert(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; int ret = FALSE; - char *name; + const char *name; virDomainSnapshotPtr snapshot = NULL; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -10213,7 +10219,7 @@ cmdSnapshotDelete(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; int ret = FALSE; - char *name; + const char *name; virDomainSnapshotPtr snapshot = NULL; unsigned int flags = 0; @@ -10270,7 +10276,7 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; int ret = FALSE; - char *monitor_cmd; + const char *monitor_cmd; char *result = NULL; unsigned int flags = 0; @@ -10842,7 +10848,7 @@ vshCommandOptUL(const vshCmd *cmd, const char *name, int *found) /* * Returns option as STRING */ -static char * +static const char * vshCommandOptString(const vshCmd *cmd, const char *name, int *found) { vshCmdOpt *arg = vshCommandOpt(cmd, name); @@ -10932,10 +10938,10 @@ cmd_has_option (vshControl *ctl, const vshCmd *cmd, const char *optname) static virDomainPtr vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, - char **name, int flag) + const char **name, int flag) { virDomainPtr dom = NULL; - char *n; + const char *n; int id; const char *optname = "domain"; if (!cmd_has_option (ctl, cmd, optname)) @@ -10979,10 +10985,10 @@ vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, static virNetworkPtr vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, - char **name, int flag) + const char **name, int flag) { virNetworkPtr network = NULL; - char *n; + const char *n; const char *optname = "network"; if (!cmd_has_option (ctl, cmd, optname)) return NULL; @@ -11018,10 +11024,10 @@ vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, static virNWFilterPtr vshCommandOptNWFilterBy(vshControl *ctl, const vshCmd *cmd, - char **name, int flag) + const char **name, int flag) { virNWFilterPtr nwfilter = NULL; - char *n; + const char *n; const char *optname = "nwfilter"; if (!cmd_has_option (ctl, cmd, optname)) return NULL; @@ -11056,10 +11062,10 @@ vshCommandOptNWFilterBy(vshControl *ctl, const vshCmd *cmd, static virInterfacePtr vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, - char **name, int flag) + const char **name, int flag) { virInterfacePtr iface = NULL; - char *n; + const char *n; const char *optname = "interface"; if (!cmd_has_option (ctl, cmd, optname)) return NULL; @@ -11094,10 +11100,10 @@ vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, static virStoragePoolPtr vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, - char **name, int flag) + const char **name, int flag) { virStoragePoolPtr pool = NULL; - char *n; + const char *n; if (!(n = vshCommandOptString(cmd, optname, NULL))) return NULL; @@ -11131,11 +11137,11 @@ static virStorageVolPtr vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, const char *pooloptname, - char **name, int flag) + const char **name, int flag) { virStorageVolPtr vol = NULL; virStoragePoolPtr pool = NULL; - char *n, *p; + const char *n, *p; int found; if (!(n = vshCommandOptString(cmd, optname, NULL))) @@ -11182,10 +11188,10 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, } static virSecretPtr -vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, char **name) +vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name) { virSecretPtr secret = NULL; - char *n; + const char *n; const char *optname = "secret"; if (!cmd_has_option (ctl, cmd, optname)) -- 1.7.4
This is needed to detect situations when optional argument was specified with non-integer value: '--int-opt foo'. To keep functions uniform vshCommandOptString function was also changed, because it returns tri-state value as well. Given result pointer is updated only in case of success. If parsing fails, result is not updated at all. --- tools/virsh.c | 613 ++++++++++++++++++++++++++------------------------------- 1 files changed, 280 insertions(+), 333 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 6ad4089..c746073 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -252,13 +252,14 @@ static const vshCmdGrp *vshCmdGrpSearch(const char *grpname); static int vshCmdGrpHelp(vshControl *ctl, const char *name); static vshCmdOpt *vshCommandOpt(const vshCmd *cmd, const char *name); -static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *found); -static unsigned long vshCommandOptUL(const vshCmd *cmd, const char *name, - int *found); -static const char *vshCommandOptString(const vshCmd *cmd, const char *name, - int *found); -static long long vshCommandOptLongLong(const vshCmd *cmd, const char *name, - int *found); +static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) + ATTRIBUTE_NONNULL(3); +static int vshCommandOptUL(const vshCmd *cmd, const char *name, + unsigned long *value) ATTRIBUTE_NONNULL(3); +static int vshCommandOptString(const vshCmd *cmd, const char *name, + const char **value) ATTRIBUTE_NONNULL(3); +static int vshCommandOptLongLong(const vshCmd *cmd, const char *name, + unsigned long long *value) ATTRIBUTE_NONNULL(3); static int vshCommandOptBool(const vshCmd *cmd, const char *name); static char *vshCommandOptArgv(const vshCmd *cmd, int count); @@ -589,11 +590,9 @@ static const vshCmdOptDef opts_help[] = { static int cmdHelp(vshControl *ctl, const vshCmd *cmd) { - const char *name; - - name = vshCommandOptString(cmd, "command", NULL); + const char *name = NULL; - if (!name) { + if (vshCommandOptString(cmd, "command", &name) <= 0) { const vshCmdGrp *grp; const vshCmdDef *def; @@ -692,7 +691,7 @@ static int cmdConnect(vshControl *ctl, const vshCmd *cmd) { int ro = vshCommandOptBool(cmd, "readonly"); - const char *name; + const char *name = NULL; if (ctl->conn) { int ret; @@ -704,8 +703,7 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) } VIR_FREE(ctl->name); - name = vshCommandOptString(cmd, "name", NULL); - if (!name) + if (vshCommandOptString(cmd, "name", &name) <= 0) return FALSE; ctl->name = vshStrdup(ctl, name); @@ -773,7 +771,7 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int ret; - const char *name; + const char *name = NULL; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -781,7 +779,7 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - name = vshCommandOptString(cmd, "devname", NULL); + vshCommandOptString(cmd, "devname", &name); ret = cmdRunConsole(ctl, dom, name); @@ -964,7 +962,7 @@ static int cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - const char *name, *device; + const char *name = NULL, *device = NULL; struct _virDomainBlockStats stats; if (!vshConnectionUsability (ctl, ctl->conn)) @@ -973,7 +971,7 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain (ctl, cmd, &name))) return FALSE; - if (!(device = vshCommandOptString (cmd, "device", NULL))) { + if (vshCommandOptString (cmd, "device", &device) <= 0) { virDomainFree(dom); return FALSE; } @@ -1021,7 +1019,7 @@ static int cmdDomIfstat (vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - const char *name, *device; + const char *name = NULL, *device = NULL; struct _virDomainInterfaceStats stats; if (!vshConnectionUsability (ctl, ctl->conn)) @@ -1030,7 +1028,7 @@ cmdDomIfstat (vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain (ctl, cmd, &name))) return FALSE; - if (!(device = vshCommandOptString (cmd, "interface", NULL))) { + if (vshCommandOptString (cmd, "interface", &device) <= 0) { virDomainFree(dom); return FALSE; } @@ -1144,7 +1142,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) virDomainBlockInfo info; virDomainPtr dom; int ret = TRUE; - const char *device; + const char *device = NULL; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -1152,7 +1150,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - if (!(device = vshCommandOptString (cmd, "device", NULL))) { + if (vshCommandOptString (cmd, "device", &device) <= 0) { virDomainFree(dom); return FALSE; } @@ -1230,8 +1228,7 @@ static int cmdCreate(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - const char *from; - int found; + const char *from = NULL; int ret = TRUE; char *buffer; #ifndef WIN32 @@ -1242,8 +1239,7 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) + if (vshCommandOptString(cmd, "file", &from) <= 0) return FALSE; if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) @@ -1288,16 +1284,14 @@ static int cmdDefine(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - const char *from; - int found; + const char *from = NULL; int ret = TRUE; char *buffer; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) + if (vshCommandOptString(cmd, "file", &from) <= 0) return FALSE; if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) @@ -1336,15 +1330,13 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int ret = TRUE; - const char *name; - int found; + const char *name = NULL; int id; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - name = vshCommandOptString(cmd, "domain", &found); - if (!found) + if (vshCommandOptString(cmd, "domain", &name) <= 0) return FALSE; if (name && virStrToLong_i(name, NULL, 10, &id) == 0 @@ -1454,14 +1446,14 @@ static int cmdSave(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - const char *name; - const char *to; + const char *name = NULL; + const char *to = NULL; int ret = TRUE; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - if (!(to = vshCommandOptString(cmd, "file", NULL))) + if (vshCommandOptString(cmd, "file", &to) <= 0) return FALSE; if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) @@ -1594,16 +1586,14 @@ static int cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd, virSchedParameterPtr param) { - int found; - const char *data; + const char *data = NULL; /* Legacy 'weight' parameter */ if (STREQ(param->field, "weight") && param->type == VIR_DOMAIN_SCHED_FIELD_UINT && vshCommandOptBool(cmd, "weight")) { int val; - val = vshCommandOptInt(cmd, "weight", &found); - if (!found) { + if (vshCommandOptInt(cmd, "weight", &val) <= 0) { vshError(ctl, "%s", _("Invalid value of weight")); return -1; } else { @@ -1617,8 +1607,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd, param->type == VIR_DOMAIN_SCHED_FIELD_UINT && vshCommandOptBool(cmd, "cap")) { int val; - val = vshCommandOptInt(cmd, "cap", &found); - if (!found) { + if (vshCommandOptInt(cmd, "cap", &val) <= 0) { vshError(ctl, "%s", _("Invalid value of cap")); return -1; } else { @@ -1627,7 +1616,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd, return 1; } - if ((data = vshCommandOptString(cmd, "set", NULL))) { + if (vshCommandOptString(cmd, "set", &data) > 0) { char *val = strchr(data, '='); int match = 0; if (!val) { @@ -1746,8 +1735,8 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) /* See if we've tried to --set var=val. If so, the fact that we reach this point (with update == 0) means that "var" did not match any of the settable parameters. Report the error. */ - const char *var_value_pair = vshCommandOptString(cmd, "set", NULL); - if (var_value_pair) { + const char *var_value_pair = NULL; + if (vshCommandOptString(cmd, "set", &var_value_pair) > 0) { vshError(ctl, _("invalid scheduler option: %s"), var_value_pair); goto cleanup; @@ -1804,15 +1793,13 @@ static const vshCmdOptDef opts_restore[] = { static int cmdRestore(vshControl *ctl, const vshCmd *cmd) { - const char *from; - int found; + const char *from = NULL; int ret = TRUE; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) + if (vshCommandOptString(cmd, "file", &from) <= 0) return FALSE; if (virDomainRestore(ctl->conn, from) == 0) { @@ -1845,15 +1832,15 @@ static int cmdDump(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - const char *name; - const char *to; + const char *name = NULL; + const char *to = NULL; int ret = TRUE; int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - if (!(to = vshCommandOptString(cmd, "file", NULL))) + if (vshCommandOptString(cmd, "file", &to) <= 0) return FALSE; if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) @@ -2300,7 +2287,10 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - cell = vshCommandOptInt(cmd, "cellno", &cell_given); + if ( (cell_given = vshCommandOptInt(cmd, "cellno", &cell)) < 0) { + vshError(ctl, "%s", _("cell number has to be a number")); + goto cleanup; + } all_given = vshCommandOptBool(cmd, "all"); if (all_given && cell_given) { @@ -2412,10 +2402,10 @@ static const vshCmdOptDef opts_maxvcpus[] = { static int cmdMaxvcpus(vshControl *ctl, const vshCmd *cmd) { - const char *type; + const char *type = NULL; int vcpus; - type = vshCommandOptString(cmd, "type", NULL); + vshCommandOptString(cmd, "type", &type); if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -2712,9 +2702,8 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; virNodeInfo nodeinfo; int vcpu; - const char *cpulist; + const char *cpulist = NULL; int ret = TRUE; - int vcpufound = 0; unsigned char *cpumap; int cpumaplen; int i; @@ -2726,14 +2715,13 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - vcpu = vshCommandOptInt(cmd, "vcpu", &vcpufound); - if (!vcpufound) { + if (vshCommandOptInt(cmd, "vcpu", &vcpu) <= 0) { vshError(ctl, "%s", _("vcpupin: Invalid or missing vCPU number.")); virDomainFree(dom); return FALSE; } - if (!(cpulist = vshCommandOptString(cmd, "cpulist", NULL))) { + if (vshCommandOptString(cmd, "cpulist", &cpulist) <= 0) { virDomainFree(dom); return FALSE; } @@ -2862,7 +2850,7 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - count = vshCommandOptInt(cmd, "count", &count); + vshCommandOptInt(cmd, "count", &count); if (!flags) { if (virDomainSetVcpus(dom, count) != 0) { @@ -2918,7 +2906,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; virDomainInfo info; - unsigned long kilobytes; + unsigned long kilobytes = 0; int ret = TRUE; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -2927,7 +2915,11 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - kilobytes = vshCommandOptUL(cmd, "kilobytes", NULL); + if (vshCommandOptUL(cmd, "kilobytes", &kilobytes) < 0) { + vshError(ctl, "%s", _("memory size has to be a number")); + return FALSE; + } + if (kilobytes <= 0) { virDomainFree(dom); vshError(ctl, _("Invalid value of %lu for memory size"), kilobytes); @@ -2975,7 +2967,7 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; virDomainInfo info; - int kilobytes; + int kilobytes = 0; int ret = TRUE; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -2984,7 +2976,11 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - kilobytes = vshCommandOptInt(cmd, "kilobytes", &kilobytes); + if (vshCommandOptInt(cmd, "kilobytes", &kilobytes) < 0) { + vshError(ctl, "%s", _("memory sizehas to be a number")); + return FALSE; + } + if (kilobytes <= 0) { virDomainFree(dom); vshError(ctl, _("Invalid value of %d for memory size"), kilobytes); @@ -3043,7 +3039,7 @@ static int cmdMemtune(vshControl * ctl, const vshCmd * cmd) { virDomainPtr dom; - long long hard_limit, soft_limit, swap_hard_limit, min_guarantee; + long long hard_limit = 0, soft_limit = 0, swap_hard_limit = 0, min_guarantee = 0; int nparams = 0; unsigned int i = 0; virMemoryParameterPtr params = NULL, temp = NULL; @@ -3055,23 +3051,19 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - hard_limit = - vshCommandOptLongLong(cmd, "hard-limit", NULL); + vshCommandOptLongLong(cmd, "hard-limit", (unsigned long long*) &hard_limit); if (hard_limit) nparams++; - soft_limit = - vshCommandOptLongLong(cmd, "soft-limit", NULL); + vshCommandOptLongLong(cmd, "soft-limit", (unsigned long long*) &soft_limit); if (soft_limit) nparams++; - swap_hard_limit = - vshCommandOptLongLong(cmd, "swap-hard-limit", NULL); + vshCommandOptLongLong(cmd, "swap-hard-limit", (unsigned long long*) &swap_hard_limit); if (swap_hard_limit) nparams++; - min_guarantee = - vshCommandOptLongLong(cmd, "min-guarantee", NULL); + vshCommandOptLongLong(cmd, "min-guarantee", (unsigned long long*) &min_guarantee); if (min_guarantee) nparams++; @@ -3315,8 +3307,8 @@ static int cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd) { int ret = TRUE; - const char *format; - const char *configFile; + const char *format = NULL; + const char *configFile = NULL; char *configData; char *xmlData; int flags = 0; @@ -3324,8 +3316,8 @@ cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - format = vshCommandOptString(cmd, "format", NULL); - configFile = vshCommandOptString(cmd, "config", NULL); + vshCommandOptString(cmd, "format", &format); + vshCommandOptString(cmd, "config", &configFile); if (virFileReadAll(configFile, 1024*1024, &configData) < 0) return FALSE; @@ -3360,8 +3352,8 @@ static int cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) { int ret = TRUE; - const char *format; - const char *xmlFile; + const char *format = NULL; + const char *xmlFile = NULL; char *configData; char *xmlData; int flags = 0; @@ -3369,8 +3361,8 @@ cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - format = vshCommandOptString(cmd, "format", NULL); - xmlFile = vshCommandOptString(cmd, "xml", NULL); + vshCommandOptString(cmd, "format", &format); + vshCommandOptString(cmd, "xml", &xmlFile); if (virFileReadAll(xmlFile, 1024*1024, &xmlData) < 0) return FALSE; @@ -3525,10 +3517,10 @@ doMigrate (void *opaque) { char ret = '1'; virDomainPtr dom = NULL; - const char *desturi; - const char *migrateuri; - const char *dname; - int flags = 0, found; + const char *desturi = NULL; + const char *migrateuri = NULL; + const char *dname = NULL; + int flags = 0; vshCtrlData *data = opaque; vshControl *ctl = data->ctl; const vshCmd *cmd = data->cmd; @@ -3547,13 +3539,12 @@ doMigrate (void *opaque) if (!(dom = vshCommandOptDomain (ctl, cmd, NULL))) goto out; - desturi = vshCommandOptString (cmd, "desturi", &found); - if (!found) + if (vshCommandOptString (cmd, "desturi", &desturi) <= 0) goto out; - migrateuri = vshCommandOptString (cmd, "migrateuri", NULL); + vshCommandOptString (cmd, "migrateuri", &migrateuri); - dname = vshCommandOptString (cmd, "dname", NULL); + vshCommandOptString (cmd, "dname", &dname); if (vshCommandOptBool (cmd, "live")) flags |= VIR_MIGRATE_LIVE; @@ -3645,13 +3636,12 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) int ret = -1; virThread workerThread; struct pollfd pollfd; - int found; char retchar; struct sigaction sig_action; struct sigaction old_sig_action; virDomainJobInfo jobinfo; bool verbose = false; - int timeout; + int timeout = 0; struct timeval start, curr; bool live_flag = false; vshCtrlData data; @@ -3670,8 +3660,7 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool (cmd, "live")) live_flag = TRUE; - timeout = vshCommandOptInt(cmd, "timeout", &found); - if (found) { + if (vshCommandOptInt(cmd, "timeout", &timeout) > 0) { if (! live_flag) { vshError(ctl, "%s", _("migrate: Unexpected timeout for offline migration")); goto cleanup; @@ -3687,8 +3676,6 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) vshError(ctl, "%s", _("migrate: Timeout is too big")); goto cleanup; } - } else { - timeout = 0; } if (pipe(p) < 0) @@ -3797,8 +3784,7 @@ static int cmdMigrateSetMaxDowntime(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; - long long downtime; - int found; + long long downtime = 0; int ret = FALSE; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -3807,8 +3793,8 @@ cmdMigrateSetMaxDowntime(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - downtime = vshCommandOptLongLong(cmd, "downtime", &found); - if (!found || downtime < 1) { + vshCommandOptLongLong(cmd, "downtime", (unsigned long long*) &downtime); + if (downtime < 1) { vshError(ctl, "%s", _("migrate: Invalid downtime")); goto done; } @@ -3890,16 +3876,14 @@ static int cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; - const char *from; - int found; + const char *from = NULL; int ret = TRUE; char *buffer; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) + if (vshCommandOptString(cmd, "file", &from) <= 0) return FALSE; if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) @@ -3938,16 +3922,14 @@ static int cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; - const char *from; - int found; + const char *from = NULL; int ret = TRUE; char *buffer; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) + if (vshCommandOptString(cmd, "file", &from) <= 0) return FALSE; if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) @@ -4711,16 +4693,14 @@ static int cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) { virInterfacePtr iface; - const char *from; - int found; + const char *from = NULL; int ret = TRUE; char *buffer; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) + if (vshCommandOptString(cmd, "file", &from) <= 0) return FALSE; if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) @@ -4873,16 +4853,14 @@ static int cmdNWFilterDefine(vshControl *ctl, const vshCmd *cmd) { virNWFilterPtr nwfilter; - const char *from; - int found; + const char *from = NULL; int ret = TRUE; char *buffer; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) + if (vshCommandOptString(cmd, "file", &from) <= 0) return FALSE; if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) @@ -5214,16 +5192,14 @@ static int cmdPoolCreate(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; - const char *from; - int found; + const char *from = NULL; int ret = TRUE; char *buffer; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) + if (vshCommandOptString(cmd, "file", &from) <= 0) return FALSE; if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) @@ -5266,18 +5242,15 @@ static int cmdNodeDeviceCreate(vshControl *ctl, const vshCmd *cmd) { virNodeDevicePtr dev = NULL; - const char *from; - int found = 0; + const char *from = NULL; int ret = TRUE; char *buffer; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) { + if (vshCommandOptString(cmd, "file", &from) <= 0) return FALSE; - } if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return FALSE; @@ -5319,17 +5292,14 @@ cmdNodeDeviceDestroy(vshControl *ctl, const vshCmd *cmd) { virNodeDevicePtr dev = NULL; int ret = TRUE; - int found = 0; - const char *name; + const char *name = NULL; if (!vshConnectionUsability(ctl, ctl->conn)) { return FALSE; } - name = vshCommandOptString(cmd, "name", &found); - if (!found) { + if (vshCommandOptString(cmd, "name", &name) <= 0) return FALSE; - } dev = virNodeDeviceLookupByName(ctl->conn, name); @@ -5363,23 +5333,21 @@ static const vshCmdOptDef opts_pool_X_as[] = { static int buildPoolXML(const vshCmd *cmd, const char **retname, char **xml) { - int found; - const char *name, *type, *srcHost, *srcPath, *srcDev, *srcName, *srcFormat, *target; + const char *name = NULL, *type = NULL, *srcHost = NULL, *srcPath = NULL, + *srcDev = NULL, *srcName = NULL, *srcFormat = NULL, *target = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; - name = vshCommandOptString(cmd, "name", &found); - if (!found) + if (vshCommandOptString(cmd, "name", &name) <= 0) goto cleanup; - type = vshCommandOptString(cmd, "type", &found); - if (!found) + if (vshCommandOptString(cmd, "type", &type) <= 0) goto cleanup; - srcHost = vshCommandOptString(cmd, "source-host", &found); - srcPath = vshCommandOptString(cmd, "source-path", &found); - srcDev = vshCommandOptString(cmd, "source-dev", &found); - srcName = vshCommandOptString(cmd, "source-name", &found); - srcFormat = vshCommandOptString(cmd, "source-format", &found); - target = vshCommandOptString(cmd, "target", &found); + vshCommandOptString(cmd, "source-host", &srcHost); + vshCommandOptString(cmd, "source-path", &srcPath); + vshCommandOptString(cmd, "source-dev", &srcDev); + vshCommandOptString(cmd, "source-name", &srcName); + vshCommandOptString(cmd, "source-format", &srcFormat); + vshCommandOptString(cmd, "target", &target); virBufferVSprintf(&buf, "<pool type='%s'>\n", type); virBufferVSprintf(&buf, " <name>%s</name>\n", name); @@ -5480,16 +5448,14 @@ static int cmdPoolDefine(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; - const char *from; - int found; + const char *from = NULL; int ret = TRUE; char *buffer; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) + if (vshCommandOptString(cmd, "file", &from) <= 0) return FALSE; if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) @@ -6178,29 +6144,22 @@ static const vshCmdOptDef opts_find_storage_pool_sources_as[] = { static int cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED) { - const char *type, *host; + const char *type = NULL, *host = NULL; char *srcSpec = NULL; char *srcList; - const char *initiator; - int found; + const char *initiator = NULL; - type = vshCommandOptString(cmd, "type", &found); - if (!found) + if (vshCommandOptString(cmd, "type", &type) <= 0) return FALSE; - host = vshCommandOptString(cmd, "host", &found); - if (!found) - host = NULL; - initiator = vshCommandOptString(cmd, "initiator", &found); - if (!found) - initiator = NULL; + vshCommandOptString(cmd, "host", &host); + vshCommandOptString(cmd, "initiator", &initiator); if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; if (host) { - const char *port = vshCommandOptString(cmd, "port", &found); - if (!found) - port = NULL; + const char *port = NULL; + vshCommandOptString(cmd, "port", &port); virBuffer buf = VIR_BUFFER_INITIALIZER; virBufferAddLit(&buf, "<source>\n"); virBufferVSprintf(&buf, " <host name='%s'", host); @@ -6253,16 +6212,13 @@ static const vshCmdOptDef opts_find_storage_pool_sources[] = { static int cmdPoolDiscoverSources(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED) { - const char *type, *srcSpecFile; + const char *type = NULL, *srcSpecFile = NULL; char *srcSpec = NULL, *srcList; - int found; - type = vshCommandOptString(cmd, "type", &found); - if (!found) + if (vshCommandOptString(cmd, "type", &type) <= 0) return FALSE; - srcSpecFile = vshCommandOptString(cmd, "srcSpec", &found); - if (!found) - srcSpecFile = NULL; + + vshCommandOptString(cmd, "srcSpec", &srcSpecFile); if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -6503,10 +6459,9 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; virStorageVolPtr vol; - int found; char *xml; - const char *name, *capacityStr, *allocationStr, *format; - const char *snapshotStrVol, *snapshotStrFormat; + const char *name, *capacityStr = NULL, *allocationStr = NULL, *format = NULL; + const char *snapshotStrVol = NULL, *snapshotStrFormat = NULL; unsigned long long capacity, allocation = 0; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -6517,24 +6472,21 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) VSH_BYNAME))) return FALSE; - name = vshCommandOptString(cmd, "name", &found); - if (!found) + if (vshCommandOptString(cmd, "name", &name) <= 0) goto cleanup; - capacityStr = vshCommandOptString(cmd, "capacity", &found); - if (!found) + if (vshCommandOptString(cmd, "capacity", &capacityStr) <= 0) goto cleanup; if (cmdVolSize(capacityStr, &capacity) < 0) vshError(ctl, _("Malformed size %s"), capacityStr); - allocationStr = vshCommandOptString(cmd, "allocation", &found); - if (allocationStr && - cmdVolSize(allocationStr, &allocation) < 0) + if ((vshCommandOptString(cmd, "allocation", &allocationStr) > 0) && + (cmdVolSize(allocationStr, &allocation) < 0)) vshError(ctl, _("Malformed size %s"), allocationStr); - format = vshCommandOptString(cmd, "format", &found); - snapshotStrVol = vshCommandOptString(cmd, "backing-vol", &found); - snapshotStrFormat = vshCommandOptString(cmd, "backing-vol-format", &found); + vshCommandOptString(cmd, "format", &format); + vshCommandOptString(cmd, "backing-vol", &snapshotStrVol); + vshCommandOptString(cmd, "backing-vol-format", &snapshotStrFormat); virBufferAddLit(&buf, "<volume>\n"); virBufferVSprintf(&buf, " <name>%s</name>\n", name); @@ -6725,8 +6677,7 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; virStorageVolPtr vol; - const char *from; - int found; + const char *from = NULL; int ret = TRUE; char *buffer; @@ -6737,8 +6688,7 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) VSH_BYNAME))) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) { + if (vshCommandOptString(cmd, "file", &from) <= 0) { virStoragePoolFree(pool); return FALSE; } @@ -6786,8 +6736,7 @@ cmdVolCreateFrom(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool = NULL; virStorageVolPtr newvol = NULL, inputvol = NULL; - const char *from; - int found; + const char *from = NULL; int ret = FALSE; char *buffer = NULL; @@ -6797,8 +6746,7 @@ cmdVolCreateFrom(vshControl *ctl, const vshCmd *cmd) if (!(pool = vshCommandOptPoolBy(ctl, cmd, "pool", NULL, VSH_BYNAME))) goto cleanup; - from = vshCommandOptString(cmd, "file", &found); - if (!found) { + if (vshCommandOptString(cmd, "file", &from) <= 0) { goto cleanup; } @@ -6885,10 +6833,9 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr origpool = NULL; virStorageVolPtr origvol = NULL, newvol = NULL; - const char *name; + const char *name = NULL; char *origxml = NULL; xmlChar *newxml = NULL; - int found; int ret = FALSE; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -6903,8 +6850,7 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - name = vshCommandOptString(cmd, "newname", &found); - if (!found) + if (vshCommandOptString(cmd, "newname", &name) <= 0) goto cleanup; origxml = virStorageVolGetXMLDesc(origvol, 0); @@ -7572,7 +7518,7 @@ static const vshCmdOptDef opts_secret_define[] = { static int cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) { - const char *from; + const char *from = NULL; char *buffer; virSecretPtr res; char uuid[VIR_UUID_STRING_BUFLEN]; @@ -7580,8 +7526,7 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - from = vshCommandOptString(cmd, "file", NULL); - if (!from) + if (vshCommandOptString(cmd, "file", &from) <= 0) return FALSE; if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) @@ -7664,9 +7609,9 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd) { virSecretPtr secret; size_t value_size; - const char *base64; + const char *base64 = NULL; char *value; - int found, res, ret = FALSE; + int res, ret = FALSE; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -7675,8 +7620,7 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd) if (secret == NULL) return FALSE; - base64 = vshCommandOptString(cmd, "base64", &found); - if (!base64) + if (vshCommandOptString(cmd, "base64", &base64) <= 0) goto cleanup; if (!base64_decode_alloc(base64, strlen(base64), &value, &value_size)) { @@ -8041,16 +7985,15 @@ cmdNodeListDevicesPrint(vshControl *ctl, static int cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { - const char *cap; + const char *cap = NULL; char **devices; - int found, num_devices, i; + int num_devices, i; int tree = vshCommandOptBool(cmd, "tree"); if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - cap = vshCommandOptString(cmd, "cap", &found); - if (!found) + if (vshCommandOptString(cmd, "cap", &cap) <= 0) cap = NULL; num_devices = virNodeNumOfDevices(ctl->conn, cap, 0); @@ -8129,13 +8072,13 @@ static const vshCmdOptDef opts_node_device_dumpxml[] = { static int cmdNodeDeviceDumpXML (vshControl *ctl, const vshCmd *cmd) { - const char *name; + const char *name = NULL; virNodeDevicePtr device; char *xml; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - if (!(name = vshCommandOptString(cmd, "device", NULL))) + if (vshCommandOptString(cmd, "device", &name) <= 0) return FALSE; if (!(device = virNodeDeviceLookupByName(ctl->conn, name))) { vshError(ctl, "%s '%s'", _("Could not find matching device"), name); @@ -8172,13 +8115,13 @@ static const vshCmdOptDef opts_node_device_dettach[] = { static int cmdNodeDeviceDettach (vshControl *ctl, const vshCmd *cmd) { - const char *name; + const char *name = NULL; virNodeDevicePtr device; int ret = TRUE; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - if (!(name = vshCommandOptString(cmd, "device", NULL))) + if (vshCommandOptString(cmd, "device", &name) <= 0) return FALSE; if (!(device = virNodeDeviceLookupByName(ctl->conn, name))) { vshError(ctl, "%s '%s'", _("Could not find matching device"), name); @@ -8213,13 +8156,13 @@ static const vshCmdOptDef opts_node_device_reattach[] = { static int cmdNodeDeviceReAttach (vshControl *ctl, const vshCmd *cmd) { - const char *name; + const char *name = NULL; virNodeDevicePtr device; int ret = TRUE; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - if (!(name = vshCommandOptString(cmd, "device", NULL))) + if (vshCommandOptString(cmd, "device", &name) <= 0) return FALSE; if (!(device = virNodeDeviceLookupByName(ctl->conn, name))) { vshError(ctl, "%s '%s'", _("Could not find matching device"), name); @@ -8254,13 +8197,13 @@ static const vshCmdOptDef opts_node_device_reset[] = { static int cmdNodeDeviceReset (vshControl *ctl, const vshCmd *cmd) { - const char *name; + const char *name = NULL; virNodeDevicePtr device; int ret = TRUE; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - if (!(name = vshCommandOptString(cmd, "device", NULL))) + if (vshCommandOptString(cmd, "device", &name) <= 0) return FALSE; if (!(device = virNodeDeviceLookupByName(ctl->conn, name))) { vshError(ctl, "%s '%s'", _("Could not find matching device"), name); @@ -8521,10 +8464,9 @@ static int cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - const char *from; + const char *from = NULL; char *buffer; int ret = TRUE; - int found; unsigned int flags; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -8533,8 +8475,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) { + if (vshCommandOptString(cmd, "file", &from) <= 0) { virDomainFree(dom); return FALSE; } @@ -8588,10 +8529,9 @@ static int cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - const char *from; + const char *from = NULL; char *buffer; int ret = TRUE; - int found; unsigned int flags; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -8600,8 +8540,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) { + if (vshCommandOptString(cmd, "file", &from) <= 0) { virDomainFree(dom); return FALSE; } @@ -8656,10 +8595,9 @@ static int cmdUpdateDevice(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - const char *from; + const char *from = NULL; char *buffer; int ret = TRUE; - int found; unsigned int flags; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -8668,8 +8606,7 @@ cmdUpdateDevice(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) { + if (vshCommandOptString(cmd, "file", &from) <= 0) { virDomainFree(dom); return FALSE; } @@ -8732,7 +8669,8 @@ static int cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; - const char *mac, *target, *script, *type, *source, *model; + const char *mac = NULL, *target = NULL, *script = NULL, + *type = NULL, *source = NULL, *model = NULL; int typ, ret = FALSE; unsigned int flags; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -8744,14 +8682,14 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) goto cleanup; - if (!(type = vshCommandOptString(cmd, "type", NULL))) + if (vshCommandOptString(cmd, "type", &type) <= 0) goto cleanup; - source = vshCommandOptString(cmd, "source", NULL); - target = vshCommandOptString(cmd, "target", NULL); - mac = vshCommandOptString(cmd, "mac", NULL); - script = vshCommandOptString(cmd, "script", NULL); - model = vshCommandOptString(cmd, "model", NULL); + vshCommandOptString(cmd, "source", &source); + vshCommandOptString(cmd, "target", &target); + vshCommandOptString(cmd, "mac", &mac); + vshCommandOptString(cmd, "script", &script); + vshCommandOptString(cmd, "model", &model); /* check interface type */ if (STREQ(type, "network")) { @@ -8842,7 +8780,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) xmlXPathContextPtr ctxt = NULL; xmlNodePtr cur = NULL; xmlBufferPtr xml_buf = NULL; - const char *mac =NULL, *type; + const char *mac =NULL, *type = NULL; char *doc; char buf[64]; int i = 0, diff_mac, ret = FALSE; @@ -8854,10 +8792,10 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) goto cleanup; - if (!(type = vshCommandOptString(cmd, "type", NULL))) + if (vshCommandOptString(cmd, "type", &type) <= 0) goto cleanup; - mac = vshCommandOptString(cmd, "mac", NULL); + vshCommandOptString(cmd, "mac", &mac); doc = virDomainGetXMLDesc(dom, 0); if (!doc) @@ -8982,10 +8920,11 @@ static int cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; - const char *source, *target, *driver, *subdriver, *type, *mode; + const char *source = NULL, *target = NULL, *driver = NULL, + *subdriver = NULL, *type = NULL, *mode = NULL; int isFile = 0, ret = FALSE; unsigned int flags; - const char *stype; + const char *stype = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; char *xml; @@ -8995,17 +8934,17 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) goto cleanup; - if (!(source = vshCommandOptString(cmd, "source", NULL))) + if (vshCommandOptString(cmd, "source", &source) <= 0) goto cleanup; - if (!(target = vshCommandOptString(cmd, "target", NULL))) + if (vshCommandOptString(cmd, "target", &target) <= 0) goto cleanup; - driver = vshCommandOptString(cmd, "driver", NULL); - subdriver = vshCommandOptString(cmd, "subdriver", NULL); - type = vshCommandOptString(cmd, "type", NULL); - mode = vshCommandOptString(cmd, "mode", NULL); - stype = vshCommandOptString(cmd, "sourcetype", NULL); + vshCommandOptString(cmd, "driver", &driver); + vshCommandOptString(cmd, "subdriver", &subdriver); + vshCommandOptString(cmd, "type", &type); + vshCommandOptString(cmd, "mode", &mode); + vshCommandOptString(cmd, "sourcetype", &stype); if (!stype) { if (driver && (STREQ(driver, "file") || STREQ(driver, "tap"))) @@ -9110,7 +9049,7 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) xmlNodePtr cur = NULL; xmlBufferPtr xml_buf = NULL; virDomainPtr dom = NULL; - const char *target; + const char *target = NULL; char *doc; int i = 0, diff_tgt, ret = FALSE; unsigned int flags; @@ -9121,7 +9060,7 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) goto cleanup; - if (!(target = vshCommandOptString(cmd, "target", NULL))) + if (vshCommandOptString(cmd, "target", &target) <= 0) goto cleanup; doc = virDomainGetXMLDesc(dom, 0); @@ -9228,8 +9167,7 @@ static const vshCmdOptDef opts_cpu_compare[] = { static int cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) { - const char *from; - int found; + const char *from = NULL; int ret = TRUE; char *buffer; int result; @@ -9237,8 +9175,7 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) + if (vshCommandOptString(cmd, "file", &from) <= 0) return FALSE; if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) @@ -9292,8 +9229,7 @@ static const vshCmdOptDef opts_cpu_baseline[] = { static int cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) { - const char *from; - int found; + const char *from = NULL; int ret = TRUE; char *buffer; char *result = NULL; @@ -9310,8 +9246,7 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - from = vshCommandOptString(cmd, "file", &found); - if (!found) + if (vshCommandOptString(cmd, "file", &from) <= 0) return FALSE; if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) @@ -9523,9 +9458,8 @@ static const vshCmdOptDef opts_cd[] = { static int cmdCd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { - const char *dir; + const char *dir = NULL; char *dir_malloced = NULL; - int found; int ret = TRUE; if (!ctl->imode) { @@ -9533,8 +9467,7 @@ cmdCd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) return FALSE; } - dir = vshCommandOptString(cmd, "dir", &found); - if (!found) { + if (vshCommandOptString(cmd, "dir", &dir) <= 0) { uid_t uid = geteuid(); dir = dir_malloced = virGetUserDirectory(uid); } @@ -9836,7 +9769,7 @@ cmdSnapshotCreate(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; int ret = FALSE; - const char *from; + const char *from = NULL; char *buffer = NULL; virDomainSnapshotPtr snapshot = NULL; xmlDocPtr xml = NULL; @@ -9851,8 +9784,7 @@ cmdSnapshotCreate(vshControl *ctl, const vshCmd *cmd) if (dom == NULL) goto cleanup; - from = vshCommandOptString(cmd, "xmlfile", NULL); - if (from == NULL) + if (vshCommandOptString(cmd, "xmlfile", &from) <= 0) buffer = vshStrdup(ctl, "<domainsnapshot/>"); else { if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) { @@ -10109,7 +10041,7 @@ cmdSnapshotDumpXML(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; int ret = FALSE; - const char *name; + const char *name = NULL; virDomainSnapshotPtr snapshot = NULL; char *xml = NULL; @@ -10120,8 +10052,7 @@ cmdSnapshotDumpXML(vshControl *ctl, const vshCmd *cmd) if (dom == NULL) goto cleanup; - name = vshCommandOptString(cmd, "snapshotname", NULL); - if (name == NULL) + if (vshCommandOptString(cmd, "snapshotname", &name) <= 0) goto cleanup; snapshot = virDomainSnapshotLookupByName(dom, name, 0); @@ -10166,7 +10097,7 @@ cmdDomainSnapshotRevert(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; int ret = FALSE; - const char *name; + const char *name = NULL; virDomainSnapshotPtr snapshot = NULL; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -10176,8 +10107,7 @@ cmdDomainSnapshotRevert(vshControl *ctl, const vshCmd *cmd) if (dom == NULL) goto cleanup; - name = vshCommandOptString(cmd, "snapshotname", NULL); - if (name == NULL) + if (vshCommandOptString(cmd, "snapshotname", &name) <= 0) goto cleanup; snapshot = virDomainSnapshotLookupByName(dom, name, 0); @@ -10219,7 +10149,7 @@ cmdSnapshotDelete(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; int ret = FALSE; - const char *name; + const char *name = NULL; virDomainSnapshotPtr snapshot = NULL; unsigned int flags = 0; @@ -10230,8 +10160,7 @@ cmdSnapshotDelete(vshControl *ctl, const vshCmd *cmd) if (dom == NULL) goto cleanup; - name = vshCommandOptString(cmd, "snapshotname", NULL); - if (name == NULL) + if (vshCommandOptString(cmd, "snapshotname", &name) <= 0) goto cleanup; if (vshCommandOptBool(cmd, "children")) @@ -10276,7 +10205,7 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; int ret = FALSE; - const char *monitor_cmd; + const char *monitor_cmd = NULL; char *result = NULL; unsigned int flags = 0; @@ -10287,8 +10216,7 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) if (dom == NULL) goto cleanup; - monitor_cmd = vshCommandOptString(cmd, "cmd", NULL); - if (monitor_cmd == NULL) { + if (vshCommandOptString(cmd, "cmd", &monitor_cmd) <= 0) { vshError(ctl, "%s", _("missing monitor command")); goto cleanup; } @@ -10804,83 +10732,104 @@ vshCommandOpt(const vshCmd *cmd, const char *name) } /* - * Returns option as INT + * @cmd command reference + * @name option name + * @value result + * + * Convert option to int + * Return value: + * >0 if option found and valid (@value updated) + * 0 in case option not found (@value untouched) + * <0 in all other cases (@value untouched) */ static int -vshCommandOptInt(const vshCmd *cmd, const char *name, int *found) +vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) { vshCmdOpt *arg = vshCommandOpt(cmd, name); - int res = 0, num_found = FALSE; + int ret = 0, num; char *end_p = NULL; if ((arg != NULL) && (arg->data != NULL)) { - res = strtol(arg->data, &end_p, 10); - if ((arg->data == end_p) || (*end_p!= 0)) - num_found = FALSE; - else - num_found = TRUE; + num = strtol(arg->data, &end_p, 10); + ret = -1; + if ((arg->data != end_p) && (*end_p == 0) && value) { + *value = num; + ret = 1; + } } - if (found) - *found = num_found; - return res; + return ret; } -static unsigned long -vshCommandOptUL(const vshCmd *cmd, const char *name, int *found) +/* + * Convert option to unsigned long + * See vshCommandOptInt() + */ +static int +vshCommandOptUL(const vshCmd *cmd, const char *name, unsigned long *value) { vshCmdOpt *arg = vshCommandOpt(cmd, name); - unsigned long res = 0; - int num_found = FALSE; + int ret = 0; + unsigned long num; char *end_p = NULL; if ((arg != NULL) && (arg->data != NULL)) { - res = strtoul(arg->data, &end_p, 10); - if ((arg->data == end_p) || (*end_p!= 0)) - num_found = FALSE; - else - num_found = TRUE; + num = strtoul(arg->data, &end_p, 10); + ret = -1; + if ((arg->data != end_p) && (*end_p == 0) && value) { + *value = num; + ret = 1; + } } - if (found) - *found = num_found; - return res; + return ret; } /* * Returns option as STRING + * See vshCommandOptInt() */ -static const char * -vshCommandOptString(const vshCmd *cmd, const char *name, int *found) +static int +vshCommandOptString(const vshCmd *cmd, const char *name, const char **value) { vshCmdOpt *arg = vshCommandOpt(cmd, name); + int ret = 0; + + if (arg && arg->data) { + ret = -1; + if (*arg->data) { + if (value) { + *value = arg->data; + ret = 1; + } + } else if (arg->def && ((arg->def->flag) & VSH_OFLAG_REQ)) { + vshError(NULL, _("Missing required option '%s'"), name); + } + } - if (found) - *found = arg ? TRUE : FALSE; - - if (arg && arg->data && *arg->data) - return arg->data; - - if (arg && arg->def && ((arg->def->flag) & VSH_OFLAG_REQ)) - vshError(NULL, _("Missing required option '%s'"), name); - - return NULL; + return ret; } /* * Returns option as long long + * See vshCommandOptInt() */ -static long long -vshCommandOptLongLong(const vshCmd *cmd, const char *name, int *found) +static int +vshCommandOptLongLong(const vshCmd *cmd, const char *name, + unsigned long long *value) { vshCmdOpt *arg = vshCommandOpt(cmd, name); - int num_found = FALSE; - long long res = 0; + int ret = 0; + long long num; char *end_p = NULL; - if ((arg != NULL) && (arg->data != NULL)) - num_found = !virStrToLong_ll(arg->data, &end_p, 10, &res); - if (found) - *found = num_found; - return res; + if ((arg != NULL) && (arg->data != NULL)) { + num = strtoll(arg->data, &end_p, 10); + ret = -1; + if ((arg->data != end_p) && (*end_p == 0) && value) { + *value = num; + ret = 1; + } + } + return ret; } /* @@ -10941,13 +10890,13 @@ vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, const char **name, int flag) { virDomainPtr dom = NULL; - const char *n; + const char *n = NULL; int id; const char *optname = "domain"; if (!cmd_has_option (ctl, cmd, optname)) return NULL; - if (!(n = vshCommandOptString(cmd, optname, NULL))) + if (vshCommandOptString(cmd, optname, &n) <= 0) return NULL; vshDebug(ctl, 5, "%s: found option <%s>: %s\n", @@ -10988,12 +10937,12 @@ vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, const char **name, int flag) { virNetworkPtr network = NULL; - const char *n; + const char *n = NULL; const char *optname = "network"; if (!cmd_has_option (ctl, cmd, optname)) return NULL; - if (!(n = vshCommandOptString(cmd, optname, NULL))) + if (vshCommandOptString(cmd, optname, &n) <= 0) return NULL; vshDebug(ctl, 5, "%s: found option <%s>: %s\n", @@ -11027,12 +10976,12 @@ vshCommandOptNWFilterBy(vshControl *ctl, const vshCmd *cmd, const char **name, int flag) { virNWFilterPtr nwfilter = NULL; - const char *n; + const char *n = NULL; const char *optname = "nwfilter"; if (!cmd_has_option (ctl, cmd, optname)) return NULL; - if (!(n = vshCommandOptString(cmd, optname, NULL))) + if (vshCommandOptString(cmd, optname, &n) <= 0) return NULL; vshDebug(ctl, 5, "%s: found option <%s>: %s\n", @@ -11065,12 +11014,12 @@ vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, const char **name, int flag) { virInterfacePtr iface = NULL; - const char *n; + const char *n = NULL; const char *optname = "interface"; if (!cmd_has_option (ctl, cmd, optname)) return NULL; - if (!(n = vshCommandOptString(cmd, optname, NULL))) + if (vshCommandOptString(cmd, optname, &n) <= 0) return NULL; vshDebug(ctl, 5, "%s: found option <%s>: %s\n", @@ -11103,9 +11052,9 @@ vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, const char **name, int flag) { virStoragePoolPtr pool = NULL; - const char *n; + const char *n = NULL; - if (!(n = vshCommandOptString(cmd, optname, NULL))) + if (vshCommandOptString(cmd, optname, &n) <= 0) return NULL; vshDebug(ctl, 5, "%s: found option <%s>: %s\n", @@ -11141,13 +11090,12 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, { virStorageVolPtr vol = NULL; virStoragePoolPtr pool = NULL; - const char *n, *p; - int found; + const char *n = NULL, *p = NULL; - if (!(n = vshCommandOptString(cmd, optname, NULL))) + if (vshCommandOptString(cmd, optname, &n) <= 0) return NULL; - if (!(p = vshCommandOptString(cmd, pooloptname, &found)) && found) + if (vshCommandOptString(cmd, pooloptname, &p) < 0) return NULL; if (p) @@ -11191,14 +11139,13 @@ static virSecretPtr vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name) { virSecretPtr secret = NULL; - const char *n; + const char *n = NULL; const char *optname = "secret"; if (!cmd_has_option (ctl, cmd, optname)) return NULL; - n = vshCommandOptString(cmd, optname, NULL); - if (n == NULL) + if (vshCommandOptString(cmd, optname, &n) <= 0) return NULL; vshDebug(ctl, 5, "%s: found option <%s>: %s\n", cmd->def->name, optname, n); -- 1.7.4
On 03/08/2011 09:29 AM, Michal Privoznik wrote:
This function should return pointer to const, because we don't want to change command option value. Therfore we can ensure const-correcntess.
s/Therfore/Therefore/; s/correcntess/correctness/
+++ b/tools/virsh.c @@ -255,7 +255,7 @@ static vshCmdOpt *vshCommandOpt(const vshCmd *cmd, const char *name); static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *found); static unsigned long vshCommandOptUL(const vshCmd *cmd, const char *name, int *found); -static char *vshCommandOptString(const vshCmd *cmd, const char *name, +static const char *vshCommandOptString(const vshCmd *cmd, const char *name, int *found);
Indentation. Most of this patch looks mechanical, and since it still compilers, that means you pretty much did it correctly.
@@ -9529,8 +9536,7 @@ cmdCd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) dir = vshCommandOptString(cmd, "dir", &found); if (!found) { uid_t uid = geteuid(); - dir = virGetUserDirectory(uid); - dir_malloced = !!dir; + dir = dir_malloced = virGetUserDirectory(uid); } if (!dir) dir = "/"; @@ -9541,7 +9547,7 @@ cmdCd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) }
if (dir_malloced) - VIR_FREE(dir); + VIR_FREE(dir_malloced);
Fails the useless-if-before-free 'make syntax-check' now that dir_malloced is a (possibly-NULL) pointer rather than a bool. ACK with those nits fixed, so I'm pushing with this squashed in: diff --git i/tools/virsh.c w/tools/virsh.c index 6ad4089..f7e1474 100644 --- i/tools/virsh.c +++ w/tools/virsh.c @@ -256,7 +256,7 @@ static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *found); static unsigned long vshCommandOptUL(const vshCmd *cmd, const char *name, int *found); static const char *vshCommandOptString(const vshCmd *cmd, const char *name, - int *found); + int *found); static long long vshCommandOptLongLong(const vshCmd *cmd, const char *name, int *found); static int vshCommandOptBool(const vshCmd *cmd, const char *name); @@ -9546,8 +9546,7 @@ cmdCd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) ret = FALSE; } - if (dir_malloced) - VIR_FREE(dir_malloced); + VIR_FREE(dir_malloced); return ret; } -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On 03/08/2011 09:29 AM, Michal Privoznik wrote:
This is needed to detect situations when optional argument was specified with non-integer value: '--int-opt foo'. To keep functions uniform vshCommandOptString function was also changed, because it returns tri-state value as well. Given result pointer is updated only in case of success. If parsing fails, result is not updated at all. --- tools/virsh.c | 613 ++++++++++++++++++++++++++------------------------------- 1 files changed, 280 insertions(+), 333 deletions(-)
Git complained about some added whitespace; 'make syntax-check' would have caught that in advance. But we finally arrived at my vision of making these parse functions useful! And the diffstat shows a net reduction in lines!
@@ -781,7 +779,7 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE;
- name = vshCommandOptString(cmd, "devname", NULL); + vshCommandOptString(cmd, "devname", &name);
Hmm, so you didn't add the ATTRIBUTE_RETURN_CHECK, after all. I guess that's okay for now.
@@ -2300,7 +2287,10 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE;
- cell = vshCommandOptInt(cmd, "cellno", &cell_given); + if ( (cell_given = vshCommandOptInt(cmd, "cellno", &cell)) < 0) { + vshError(ctl, "%s", _("cell number has to be a number")); + goto cleanup; + }
Ouch - you didn't pre-initialize cell, but there is still a codepath where you check if (cell == -1). Too bad gcc didn't flag it.
@@ -2862,7 +2850,7 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE;
- count = vshCommandOptInt(cmd, "count", &count); + vshCommandOptInt(cmd, "count", &count);
We really should be adding ATTRIBUTE_RETURN_CHECK, and flagging parse errors. Otherwise, you end up using uninitialized data for count on a parse error. Basically, anywhere we used to give an error for !found, we now give an error for result <= 0; and anywhere we didn't care about found, we now give an error for result < 0.
@@ -2984,7 +2976,11 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE;
- kilobytes = vshCommandOptInt(cmd, "kilobytes", &kilobytes); + if (vshCommandOptInt(cmd, "kilobytes", &kilobytes) < 0) { + vshError(ctl, "%s", _("memory sizehas to be a number"));
s/sizehas/size has/
@@ -3055,23 +3051,19 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE;
- hard_limit = - vshCommandOptLongLong(cmd, "hard-limit", NULL); + vshCommandOptLongLong(cmd, "hard-limit", (unsigned long long*) &hard_limit);
Yuck - why are we casting here? Oh, because you set vshCommandOptLongLong to take ull* instead of ll*.
/* - * Returns option as INT + * @cmd command reference + * @name option name + * @value result + * + * Convert option to int + * Return value: + * >0 if option found and valid (@value updated) + * 0 in case option not found (@value untouched) + * <0 in all other cases (@value untouched) */ static int -vshCommandOptInt(const vshCmd *cmd, const char *name, int *found) +vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) { vshCmdOpt *arg = vshCommandOpt(cmd, name); - int res = 0, num_found = FALSE; + int ret = 0, num; char *end_p = NULL;
if ((arg != NULL) && (arg->data != NULL)) { - res = strtol(arg->data, &end_p, 10); - if ((arg->data == end_p) || (*end_p!= 0)) - num_found = FALSE; - else - num_found = TRUE; + num = strtol(arg->data, &end_p, 10); + ret = -1; + if ((arg->data != end_p) && (*end_p == 0) && value) {
This check for non-NULL value is redundant, given that you already used the compiler ATTRIBUTE_NONNULL to guarantee that (at least, for decently smart compilers; it's a shame that gcc only warns for literal NULL and that you have to use clang to catch other null parameters via data-flow checks). Here's what I'm squashing in before pushing: diff --git i/tools/virsh.c w/tools/virsh.c index d4d0949..14c6d6b 100644 --- i/tools/virsh.c +++ w/tools/virsh.c @@ -253,14 +253,16 @@ static int vshCmdGrpHelp(vshControl *ctl, const char *name); static vshCmdOpt *vshCommandOpt(const vshCmd *cmd, const char *name); static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) - ATTRIBUTE_NONNULL(3); + ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; static int vshCommandOptUL(const vshCmd *cmd, const char *name, - unsigned long *value) ATTRIBUTE_NONNULL(3); + unsigned long *value) + ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; static int vshCommandOptString(const vshCmd *cmd, const char *name, - const char **value) ATTRIBUTE_NONNULL(3); + const char **value) + ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; static int vshCommandOptLongLong(const vshCmd *cmd, const char *name, - unsigned long long *value) - ATTRIBUTE_NONNULL(3); + long long *value) + ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; static int vshCommandOptBool(const vshCmd *cmd, const char *name); static char *vshCommandOptArgv(const vshCmd *cmd, int count); @@ -780,7 +782,8 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - vshCommandOptString(cmd, "devname", &name); + if (vshCommandOptString(cmd, "devname", &name) < 0) + return FALSE; ret = cmdRunConsole(ctl, dom, name); @@ -2272,7 +2275,7 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) { int func_ret = FALSE; int ret; - int cell, cell_given; + int cell = -1, cell_given; unsigned long long memory; xmlNodePtr *nodes = NULL; unsigned long nodes_cnt; @@ -2406,7 +2409,8 @@ cmdMaxvcpus(vshControl *ctl, const vshCmd *cmd) const char *type = NULL; int vcpus; - vshCommandOptString(cmd, "type", &type); + if (vshCommandOptString(cmd, "type", &type) < 0) + return FALSE; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -2851,7 +2855,8 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - vshCommandOptInt(cmd, "count", &count); + if (vshCommandOptInt(cmd, "count", &count) < 0) + return FALSE; if (!flags) { if (virDomainSetVcpus(dom, count) != 0) { @@ -2978,7 +2983,7 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) return FALSE; if (vshCommandOptInt(cmd, "kilobytes", &kilobytes) < 0) { - vshError(ctl, "%s", _("memory sizehas to be a number")); + vshError(ctl, "%s", _("memory size has to be a number")); return FALSE; } @@ -3040,7 +3045,8 @@ static int cmdMemtune(vshControl * ctl, const vshCmd * cmd) { virDomainPtr dom; - long long hard_limit = 0, soft_limit = 0, swap_hard_limit = 0, min_guarantee = 0; + long long hard_limit = 0, soft_limit = 0, swap_hard_limit = 0; + long long min_guarantee = 0; int nparams = 0; unsigned int i = 0; virMemoryParameterPtr params = NULL, temp = NULL; @@ -3052,19 +3058,24 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - vshCommandOptLongLong(cmd, "hard-limit", (unsigned long long*) &hard_limit); + if (vshCommandOptLongLong(cmd, "hard-limit", &hard_limit) < 0 || + vshCommandOptLongLong(cmd, "soft-limit", &soft_limit) < 0 || + vshCommandOptLongLong(cmd, "swap-hard-limit", &swap_hard_limit) < 0 || + vshCommandOptLongLong(cmd, "min-guarantee", &min_guarantee) < 0) { + vshError(ctl, "%s", + _("Unable to parse integer parameter")); + goto cleanup; + } + if (hard_limit) nparams++; - vshCommandOptLongLong(cmd, "soft-limit", (unsigned long long*) &soft_limit); if (soft_limit) nparams++; - vshCommandOptLongLong(cmd, "swap-hard-limit", (unsigned long long*) &swap_hard_limit); if (swap_hard_limit) nparams++; - vshCommandOptLongLong(cmd, "min-guarantee", (unsigned long long*) &min_guarantee); if (min_guarantee) nparams++; @@ -3317,8 +3328,9 @@ cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - vshCommandOptString(cmd, "format", &format); - vshCommandOptString(cmd, "config", &configFile); + if (vshCommandOptString(cmd, "format", &format) < 0 || + vshCommandOptString(cmd, "config", &configFile) < 0) + return FALSE; if (virFileReadAll(configFile, 1024*1024, &configData) < 0) return FALSE; @@ -3362,8 +3374,9 @@ cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - vshCommandOptString(cmd, "format", &format); - vshCommandOptString(cmd, "xml", &xmlFile); + if (vshCommandOptString(cmd, "format", &format) < 0 + || vshCommandOptString(cmd, "xml", &xmlFile) < 0) + return FALSE; if (virFileReadAll(xmlFile, 1024*1024, &xmlData) < 0) return FALSE; @@ -3540,13 +3553,11 @@ doMigrate (void *opaque) if (!(dom = vshCommandOptDomain (ctl, cmd, NULL))) goto out; - if (vshCommandOptString (cmd, "desturi", &desturi) <= 0) + if (vshCommandOptString(cmd, "desturi", &desturi) <= 0 || + vshCommandOptString(cmd, "migrateuri", &migrateuri) < 0 || + vshCommandOptString(cmd, "dname", &dname) < 0) goto out; - vshCommandOptString (cmd, "migrateuri", &migrateuri); - - vshCommandOptString (cmd, "dname", &dname); - if (vshCommandOptBool (cmd, "live")) flags |= VIR_MIGRATE_LIVE; if (vshCommandOptBool (cmd, "p2p")) @@ -3794,8 +3805,8 @@ cmdMigrateSetMaxDowntime(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - vshCommandOptLongLong(cmd, "downtime", (unsigned long long*) &downtime); - if (downtime < 1) { + if (vshCommandOptLongLong(cmd, "downtime", &downtime) < 0 || + downtime < 1) { vshError(ctl, "%s", _("migrate: Invalid downtime")); goto done; } @@ -5343,12 +5354,13 @@ static int buildPoolXML(const vshCmd *cmd, const char **retname, char **xml) { if (vshCommandOptString(cmd, "type", &type) <= 0) goto cleanup; - vshCommandOptString(cmd, "source-host", &srcHost); - vshCommandOptString(cmd, "source-path", &srcPath); - vshCommandOptString(cmd, "source-dev", &srcDev); - vshCommandOptString(cmd, "source-name", &srcName); - vshCommandOptString(cmd, "source-format", &srcFormat); - vshCommandOptString(cmd, "target", &target); + if (vshCommandOptString(cmd, "source-host", &srcHost) < 0 || + vshCommandOptString(cmd, "source-path", &srcPath) < 0 || + vshCommandOptString(cmd, "source-dev", &srcDev) < 0 || + vshCommandOptString(cmd, "source-name", &srcName) < 0 || + vshCommandOptString(cmd, "source-format", &srcFormat) < 0 || + vshCommandOptString(cmd, "target", &target) < 0) + goto cleanup; virBufferVSprintf(&buf, "<pool type='%s'>\n", type); virBufferVSprintf(&buf, " <name>%s</name>\n", name); @@ -6150,18 +6162,23 @@ cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED) char *srcList; const char *initiator = NULL; - if (vshCommandOptString(cmd, "type", &type) <= 0) + if (vshCommandOptString(cmd, "type", &type) <= 0 || + vshCommandOptString(cmd, "host", &host) < 0 || + vshCommandOptString(cmd, "initiator", &initiator) < 0) return FALSE; - vshCommandOptString(cmd, "host", &host); - vshCommandOptString(cmd, "initiator", &initiator); if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; if (host) { const char *port = NULL; - vshCommandOptString(cmd, "port", &port); virBuffer buf = VIR_BUFFER_INITIALIZER; + + if (vshCommandOptString(cmd, "port", &port) < 0) { + vshError(ctl, "%s", _("missing argument")); + virBufferFreeAndReset(&buf); + return FALSE; + } virBufferAddLit(&buf, "<source>\n"); virBufferVSprintf(&buf, " <host name='%s'", host); if (port) @@ -6219,7 +6236,8 @@ cmdPoolDiscoverSources(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED) if (vshCommandOptString(cmd, "type", &type) <= 0) return FALSE; - vshCommandOptString(cmd, "srcSpec", &srcSpecFile); + if (vshCommandOptString(cmd, "srcSpec", &srcSpecFile) < 0) + return FALSE; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -6485,9 +6503,13 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) (cmdVolSize(allocationStr, &allocation) < 0)) vshError(ctl, _("Malformed size %s"), allocationStr); - vshCommandOptString(cmd, "format", &format); - vshCommandOptString(cmd, "backing-vol", &snapshotStrVol); - vshCommandOptString(cmd, "backing-vol-format", &snapshotStrFormat); + if (vshCommandOptString(cmd, "format", &format) < 0 || + vshCommandOptString(cmd, "backing-vol", &snapshotStrVol) < 0 || + vshCommandOptString(cmd, "backing-vol-format", + &snapshotStrFormat) < 0) { + vshError(ctl, "%s", _("missing argument")); + } + virBufferAddLit(&buf, "<volume>\n"); virBufferVSprintf(&buf, " <name>%s</name>\n", name); @@ -8686,11 +8708,12 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptString(cmd, "type", &type) <= 0) goto cleanup; - vshCommandOptString(cmd, "source", &source); - vshCommandOptString(cmd, "target", &target); - vshCommandOptString(cmd, "mac", &mac); - vshCommandOptString(cmd, "script", &script); - vshCommandOptString(cmd, "model", &model); + if (vshCommandOptString(cmd, "source", &source) < 0 || + vshCommandOptString(cmd, "target", &target) < 0 || + vshCommandOptString(cmd, "mac", &mac) < 0 || + vshCommandOptString(cmd, "script", &script) < 0 || + vshCommandOptString(cmd, "model", &model) < 0) + goto cleanup; /* check interface type */ if (STREQ(type, "network")) { @@ -8796,7 +8819,8 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptString(cmd, "type", &type) <= 0) goto cleanup; - vshCommandOptString(cmd, "mac", &mac); + if (vshCommandOptString(cmd, "mac", &mac) < 0) + goto cleanup; doc = virDomainGetXMLDesc(dom, 0); if (!doc) @@ -8941,11 +8965,13 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptString(cmd, "target", &target) <= 0) goto cleanup; - vshCommandOptString(cmd, "driver", &driver); - vshCommandOptString(cmd, "subdriver", &subdriver); - vshCommandOptString(cmd, "type", &type); - vshCommandOptString(cmd, "mode", &mode); - vshCommandOptString(cmd, "sourcetype", &stype); + if (vshCommandOptString(cmd, "driver", &driver) < 0 || + vshCommandOptString(cmd, "subdriver", &subdriver) < 0 || + vshCommandOptString(cmd, "type", &type) < 0 || + vshCommandOptString(cmd, "mode", &mode) < 0 || + vshCommandOptString(cmd, "sourcetype", &stype) < 0) { + goto cleanup; + } if (!stype) { if (driver && (STREQ(driver, "file") || STREQ(driver, "tap"))) @@ -10752,7 +10778,7 @@ vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) if ((arg != NULL) && (arg->data != NULL)) { num = strtol(arg->data, &end_p, 10); ret = -1; - if ((arg->data != end_p) && (*end_p == 0) && value) { + if ((arg->data != end_p) && (*end_p == 0)) { *value = num; ret = 1; } @@ -10775,7 +10801,7 @@ vshCommandOptUL(const vshCmd *cmd, const char *name, unsigned long *value) if ((arg != NULL) && (arg->data != NULL)) { num = strtoul(arg->data, &end_p, 10); ret = -1; - if ((arg->data != end_p) && (*end_p == 0) && value) { + if ((arg->data != end_p) && (*end_p == 0)) { *value = num; ret = 1; } @@ -10801,7 +10827,7 @@ vshCommandOptString(const vshCmd *cmd, const char *name, const char **value) ret = 1; } } else if (arg->def && ((arg->def->flag) & VSH_OFLAG_REQ)) { - vshError(NULL, _("Missing required option '%s'"), name); + vshError(NULL, _("Missing required option '%s'"), name); } } @@ -10814,7 +10840,7 @@ vshCommandOptString(const vshCmd *cmd, const char *name, const char **value) */ static int vshCommandOptLongLong(const vshCmd *cmd, const char *name, - unsigned long long *value) + long long *value) { vshCmdOpt *arg = vshCommandOpt(cmd, name); int ret = 0; @@ -10824,7 +10850,7 @@ vshCommandOptLongLong(const vshCmd *cmd, const char *name, if ((arg != NULL) && (arg->data != NULL)) { num = strtoll(arg->data, &end_p, 10); ret = -1; - if ((arg->data != end_p) && (*end_p == 0) && value) { + if ((arg->data != end_p) && (*end_p == 0)) { *value = num; ret = 1; } -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake -
Michal Privoznik