External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move local argvToString to virArgvToString in util.

Browse Source
This commit is contained in:
Cole Robinson 2008-11-05 18:22:10 +00:00
parent 7271a92bec
commit f1ca068666
4 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Nov 5 13:19:00 EST 2008 Cole Robinson <crobinso@redhat.com>
* src/iptables.c, src/util.c, src/util.h: Move local argvToString to
virArgvToString.
Wed Nov 5 15:22:12 CET 2008 Jim Meyering <meyering@redhat.com>
plug two leaks and fix a diagnostic

28
src/iptables.c
View File

@ -384,32 +384,6 @@ iptRulesNew(const char *table,
return NULL;
}
static char *
argvToString(const char *const *argv)
{
int len, i;
char *ret, *p;
for (len = 1, i = 0; argv[i]; i++)
len += strlen(argv[i]) + 1;
if (VIR_ALLOC_N(ret, len) < 0)
return NULL;
p = ret;
for (i = 0; argv[i]; i++) {
if (i != 0)
*(p++) = ' ';
strcpy(p, argv[i]);
p += strlen(argv[i]);
}
*p = '\0';
return ret;
}
static int
iptablesAddRemoveRule(iptRules *rules, int action, const char *arg, ...)
{
@ -464,7 +438,7 @@ iptablesAddRemoveRule(iptRules *rules, int action, const char *arg, ...)
va_end(args);
if (!(rule = argvToString(&argv[command_idx])))
if (!(rule = virArgvToString(&argv[command_idx])))
goto error;
if (action == REMOVE) {

27
src/util.c
View File

@ -87,6 +87,33 @@ int virFileStripSuffix(char *str,
return 1;
}
char *
virArgvToString(const char *const *argv)
{
int len, i;
char *ret, *p;
for (len = 1, i = 0; argv[i]; i++)
len += strlen(argv[i]) + 1;
if (VIR_ALLOC_N(ret, len) < 0)
return NULL;
p = ret;
for (i = 0; argv[i]; i++) {
if (i != 0)
*(p++) = ' ';
strcpy(p, argv[i]);
p += strlen(argv[i]);
}
*p = '\0';
return ret;
}
#ifndef __MINGW32__
static int virSetCloseExec(int fd) {

2
src/util.h
View File

@ -88,6 +88,8 @@ int virFileReadPid(const char *dir,
int virFileDeletePid(const char *dir,
const char *name);
char *virArgvToString(const char *const *argv);
int __virStrToLong_i(char const *s,
char **end_ptr,
int base,