External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 11:31:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

network_conf: Expose virNetworkDefFormatInternal

Browse Source 
In the next patch I'm going to need the network format function that
takes virBuffer as argument. However, slightly change of name is more
appropriate then: virNetworkDefFormatBuf to match the rest of functions
that format an object to buffer.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2014-02-12 17:36:35 +01:00
parent 5fc590ad9f
commit e0a31274ec
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/conf/network_conf.c
View File

@ -2593,10 +2593,10 @@ cleanup:
return ret; return ret;
} }
static int int
virNetworkDefFormatInternal(virBufferPtr buf, virNetworkDefFormatBuf(virBufferPtr buf,
const virNetworkDef *def, const virNetworkDef *def,
unsigned int flags) unsigned int flags)
{ {
const unsigned char *uuid; const unsigned char *uuid;
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
@ -2763,7 +2763,7 @@ virNetworkDefFormat(const virNetworkDef *def,
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
if (virNetworkDefFormatInternal(&buf, def, flags) < 0) if (virNetworkDefFormatBuf(&buf, def, flags) < 0)
goto error; goto error;
if (virBufferError(&buf)) if (virBufferError(&buf))
@ -2794,7 +2794,7 @@ virNetworkObjFormat(virNetworkObjPtr net,
VIR_FREE(class_id); VIR_FREE(class_id);
virBufferAdjustIndent(&buf, 2); virBufferAdjustIndent(&buf, 2);
if (virNetworkDefFormatInternal(&buf, net->def, flags) < 0) if (virNetworkDefFormatBuf(&buf, net->def, flags) < 0)
goto error; goto error;
virBufferAdjustIndent(&buf, -2); virBufferAdjustIndent(&buf, -2);

3
src/conf/network_conf.h
View File

@ -338,6 +338,9 @@ virNetworkDefPtr virNetworkDefParseFile(const char *filename);
virNetworkDefPtr virNetworkDefParseNode(xmlDocPtr xml, virNetworkDefPtr virNetworkDefParseNode(xmlDocPtr xml,
xmlNodePtr root); xmlNodePtr root);
char *virNetworkDefFormat(const virNetworkDef *def, unsigned int flags); char *virNetworkDefFormat(const virNetworkDef *def, unsigned int flags);
int virNetworkDefFormatBuf(virBufferPtr buf,
const virNetworkDef *def,
unsigned int flags);
static inline const char * static inline const char *
virNetworkDefForwardIf(const virNetworkDef *def, size_t n) virNetworkDefForwardIf(const virNetworkDef *def, size_t n)

1
src/libvirt_private.syms
View File

@ -505,6 +505,7 @@ virNetworkConfigChangeSetup;
virNetworkConfigFile; virNetworkConfigFile;
virNetworkDefCopy; virNetworkDefCopy;
virNetworkDefFormat; virNetworkDefFormat;
virNetworkDefFormatBuf;
virNetworkDefFree; virNetworkDefFree;
virNetworkDefGetIpByIndex; virNetworkDefGetIpByIndex;
virNetworkDefParseFile; virNetworkDefParseFile;