External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove two unused PATH_MAX-sized char arrays from the stack

Browse Source
This commit is contained in:
Matthias Bolte 2011-01-15 17:38:57 +01:00
parent e065e1ea04
commit 915bc7421e
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/storage/storage_driver.c
View File

@ -127,9 +127,9 @@ storageDriverAutostart(virStorageDriverStatePtr driver) {
* Initialization function for the QEmu daemon
*/
static int
storageDriverStartup(int privileged) {
storageDriverStartup(int privileged)
{
char *base = NULL;
char driverConf[PATH_MAX];
if (VIR_ALLOC(driverState) < 0)
return -1;
@ -160,11 +160,6 @@ storageDriverStartup(int privileged) {
/* Configuration paths are either ~/.libvirt/storage/... (session) or
* /etc/libvirt/storage/... (system).
*/
if (snprintf (driverConf, sizeof(driverConf),
"%s/storage.conf", base) == -1)
goto out_of_memory;
driverConf[sizeof(driverConf)-1] = '\0';
if (virAsprintf(&driverState->configDir,
"%s/storage", base) == -1)
goto out_of_memory;
@ -175,13 +170,6 @@ storageDriverStartup(int privileged) {
VIR_FREE(base);
/*
if (virStorageLoadDriverConfig(driver, driverConf) < 0) {
virStorageDriverShutdown();
return -1;
}
*/
if (virStoragePoolLoadAllConfigs(&driverState->pools,
driverState->configDir,
driverState->autostartDir) < 0)

8
src/uml/uml_driver.c
View File

@ -342,10 +342,10 @@ cleanup:
* Initialization function for the Uml daemon
*/
static int
umlStartup(int privileged) {
umlStartup(int privileged)
{
uid_t uid = geteuid();
char *base = NULL;
char driverConf[PATH_MAX];
char *userdir = NULL;
if (VIR_ALLOC(uml_driver) < 0)
@ -398,10 +398,6 @@ umlStartup(int privileged) {
/* Configuration paths are either ~/.libvirt/uml/... (session) or
* /etc/libvirt/uml/... (system).
*/
if (snprintf (driverConf, sizeof(driverConf), "%s/uml.conf", base) == -1)
goto out_of_memory;
driverConf[sizeof(driverConf)-1] = '\0';
if (virAsprintf(&uml_driver->configDir, "%s/uml", base) == -1)
goto out_of_memory;