From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 4 May 2007 15:48:58 +0000 (+0000)
Subject: Check for orphan memory + minor format tweaks
X-Git-Tag: Release-2.2.0~585
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=327b0c4e202495c06a120df9833bee2a338dabab;p=bacula%2Fbacula

Check for orphan memory + minor format tweaks

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4695 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp
index 088bc43ad6..96cc44d59e 100644
--- a/bacula/src/win32/compat/compat.cpp
+++ b/bacula/src/win32/compat/compat.cpp
@@ -50,8 +50,8 @@
    conversion is called 3 times (lstat, attribs, open),
    by using the cache this is reduced to 1 time */
 
-static POOLMEM *g_pWin32ConvUTF8Cache = get_pool_memory (PM_FNAME);
-static POOLMEM *g_pWin32ConvUCS2Cache = get_pool_memory (PM_FNAME);
+static POOLMEM *g_pWin32ConvUTF8Cache = get_pool_memory(PM_FNAME);
+static POOLMEM *g_pWin32ConvUCS2Cache = get_pool_memory(PM_FNAME);
 static DWORD g_dwWin32ConvUTF8strlen = 0;
 static pthread_mutex_t Win32Convmutex = PTHREAD_MUTEX_INITIALIZER;
 
diff --git a/bacula/src/win32/filed/vss.cpp b/bacula/src/win32/filed/vss.cpp
index 68ff5b86ab..0043c9913b 100644
--- a/bacula/src/win32/filed/vss.cpp
+++ b/bacula/src/win32/filed/vss.cpp
@@ -90,8 +90,8 @@ VSSClient::VSSClient()
     m_bDuringRestore = false;
     m_bBackupIsInitialized = false;
     m_pVssObject = NULL;
-    m_pAlistWriterState = New (alist(10, not_owned_by_alist));
-    m_pAlistWriterInfoText = New (alist(10, owned_by_alist));
+    m_pAlistWriterState = New(alist(10, not_owned_by_alist));
+    m_pAlistWriterInfoText = New(alist(10, owned_by_alist));
     m_uidCurrentSnapshotSet = GUID_NULL;
     memset(m_wszUniqueVolumeName, 0, sizeof(m_wszUniqueVolumeName));
     memset(m_szShadowCopyName, 0, sizeof(m_szShadowCopyName));
@@ -108,8 +108,8 @@ VSSClient::~VSSClient()
    }
 
    DestroyWriterInfo();
-   delete (alist*) m_pAlistWriterState;
-   delete (alist*) m_pAlistWriterInfoText;
+   delete (alist*)m_pAlistWriterState;
+   delete (alist*)m_pAlistWriterInfoText;
 
    // Call CoUninitialize if the CoInitialize was performed successfully
    if (m_bCoInitializeCalled)
diff --git a/bacula/src/win32/filed/winmain.cpp b/bacula/src/win32/filed/winmain.cpp
index bab23b45cf..d449faaa16 100644
--- a/bacula/src/win32/filed/winmain.cpp
+++ b/bacula/src/win32/filed/winmain.cpp
@@ -116,8 +116,9 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
    /* Build Unix style argc *argv[] */      
 
    /* Don't NULL command_args[0] !!! */
-   for (i=1;i<MAX_COMMAND_ARGS;i++)
+   for (i=1;i<MAX_COMMAND_ARGS;i++) {
       command_args[i] = NULL;
+   }
 
    char *pszArgs = bstrdup(szCmdLine);
    wordPtr = pszArgs;
@@ -231,7 +232,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 
       return 1;
    }
-
    return BaculaAppMain();
 }