External/libvirt
1
0
Fork 0
Code

virsh: reduce complexity in argv iteration

Browse Source 
This reduces things from O(n^2) to O(n).

* tools/virsh.c (vshCommandOptArgv): Change signature.
(cmdEcho): Update caller.
Based on a patch by Lai Jiangshan.
This commit is contained in:
Eric Blake 2011-06-14 11:26:20 -06:00
parent b86524e8d5
commit a2ff807a68
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/virsh.c
View File

@ -281,7 +281,8 @@ static int vshCommandOptULongLong(const vshCmd *cmd, const char *name,
unsigned long long *value) unsigned long long *value)
ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK;
static bool vshCommandOptBool(const vshCmd *cmd, const char *name); static bool vshCommandOptBool(const vshCmd *cmd, const char *name);
static char *vshCommandOptArgv(const vshCmd *cmd, int count); static const vshCmdOpt *vshCommandOptArgv(const vshCmd *cmd,
const vshCmdOpt *opt);
#define VSH_BYID (1 << 1) #define VSH_BYID (1 << 1)
#define VSH_BYUUID (1 << 2) #define VSH_BYUUID (1 << 2)
@ -10740,6 +10741,7 @@ cmdEcho (vshControl *ctl ATTRIBUTE_UNUSED, const vshCmd *cmd)
bool shell = false; bool shell = false;
bool xml = false; bool xml = false;
int count = 0; int count = 0;
const vshCmdOpt *opt = NULL;
char *arg; char *arg;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
@ -10748,10 +10750,11 @@ cmdEcho (vshControl *ctl ATTRIBUTE_UNUSED, const vshCmd *cmd)
if (vshCommandOptBool(cmd, "xml")) if (vshCommandOptBool(cmd, "xml"))
xml = true; xml = true;
while ((arg = vshCommandOptArgv(cmd, count)) != NULL) { while ((opt = vshCommandOptArgv(cmd, opt))) {
bool close_quote = false; bool close_quote = false;
char *q; char *q;
arg = opt->data;
if (count) if (count)
virBufferAddChar(&buf, ' '); virBufferAddChar(&buf, ' ');
/* Add outer '' only if arg included shell metacharacters. */ /* Add outer '' only if arg included shell metacharacters. */
@ -12215,20 +12218,20 @@ vshCommandOptBool(const vshCmd *cmd, const char *name)
} }
/* /*
* Returns the COUNT argv argument, or NULL after last argument. * Returns the next argv argument after OPT (or the first one if OPT
* is NULL), or NULL if no more are present.
* *
* Requires that a VSH_OT_ARGV option with the name "" be last in the * Requires that a VSH_OT_ARGV option be last in the
* list of supported options in CMD->def->opts. * list of supported options in CMD->def->opts.
*/ */
static char * static const vshCmdOpt *
vshCommandOptArgv(const vshCmd *cmd, int count) vshCommandOptArgv(const vshCmd *cmd, const vshCmdOpt *opt)
{ {
vshCmdOpt *opt = cmd->opts; opt = opt ? opt->next : cmd->opts;
while (opt) { while (opt) {
if (opt->def && opt->def->type == VSH_OT_ARGV) { if (opt->def && opt->def->type == VSH_OT_ARGV) {
if (count-- == 0) return opt;
return opt->data;
} }
opt = opt->next; opt = opt->next;
} }