remove unused function in mangle.c

fix some alloc leaks spotted by andreas moroder.
(This used to be commit 39409a20f69078709c63f6f867c042e66d5c7de3)

diff --git a/source3/smbd/mangle.c b/source3/smbd/mangle.c
index a28cfe09319b652a6f822ecf1fdfeae18b120edc..7d8d68c9e2b781399d9daf267c8aa4d444b3589f 100644 (file)
--- a/source3/smbd/mangle.c
+++ b/source3/smbd/mangle.c
@@ -1000,18 +1000,6 @@ BOOL name_map_mangle(char *OutName, BOOL need83, BOOL cache83, int snum)
 
 static TDB_CONTEXT     *mangle_tdb;
 
-static int POW10(unsigned int exp)
-{
-       int result = 1;
-       
-       while (exp) {
-               result *= 10;
-               exp--;
-       }
-  
-       return result;
-}
-
 BOOL init_mangle_tdb(void)
 {
        char *tdbfile;

diff --git a/source3/smbwrapper/shared.c b/source3/smbwrapper/shared.c
index a10ef05bfca1d04dd1b1551284aa9a67af8d5175..90accbb503f35975bfe1b24b42b0f1ee8463cc3c 100644 (file)
--- a/source3/smbwrapper/shared.c
+++ b/source3/smbwrapper/shared.c
@@ -104,6 +104,7 @@ char *smbw_getshared(const char *name)
 {
        int i;
        struct stat st;
+       char *var;
 
        lockit();
 
@@ -111,8 +112,9 @@ char *smbw_getshared(const char *name)
        if (fstat(shared_fd, &st)) goto failed;
 
        if (st.st_size != shared_size) {
-               variables = (char *)Realloc(variables, st.st_size);
-               if (!variables) goto failed;
+               var = (char *)Realloc(variables, st.st_size);
+               if (!var) goto failed;
+               else variables = var;
                shared_size = st.st_size;
                lseek(shared_fd, 0, SEEK_SET);
                if (read(shared_fd, variables, shared_size) != shared_size) {
@@ -156,6 +158,7 @@ set a variable in the shared area
 void smbw_setshared(const char *name, const char *val)
 {
        int l1, l2;
+       char *var;
 
        /* we don't allow variable overwrite */
        if (smbw_getshared(name)) return;
@@ -165,12 +168,14 @@ void smbw_setshared(const char *name, const char *val)
        l1 = strlen(name)+1;
        l2 = strlen(val)+1;
 
-       variables = (char *)Realloc(variables, shared_size + l1+l2+4);
+       var = (char *)Realloc(variables, shared_size + l1+l2+4);
 
-       if (!variables) {
+       if (!var) {
                DEBUG(0,("out of memory in smbw_setshared\n"));
                exit(1);
        }
+       
+       variables = var;
 
        SSVAL(&variables[shared_size], 0, l1);
        SSVAL(&variables[shared_size], 2, l2);

diff --git a/source3/smbwrapper/smbw_dir.c b/source3/smbwrapper/smbw_dir.c
index cd10b488a1a90aa2b54bd9b4fe805d7bbc5d441a..6be88e4df38615ee5b6390d2b46c80e2e64c744d 100644 (file)
--- a/source3/smbwrapper/smbw_dir.c
+++ b/source3/smbwrapper/smbw_dir.c
@@ -87,7 +87,7 @@ static void smbw_dir_add(struct file_info *finfo, const char *mask,
                cdl = (struct file_info *)Realloc(cur_dir->list, 
                                                            sizeof(cur_dir->list[0])*
                                                            (cur_dir->count+100));
-               if (!cur_dir->list) {
+               if (!cdl) {
                        /* oops */
                        return;
                }