summaryrefslogtreecommitdiffstats
path: root/source/printing
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-07-02 18:37:39 +0000
committerJeremy Allison <jra@samba.org>2001-07-02 18:37:39 +0000
commit2f8b84bda040edc87a7af29c3a281cf335e392cb (patch)
treea44fd8c68ffc807ca53ddd5a4642cec907c2c6f5 /source/printing
parentc2977be3408645499915d728538ba2c65b97614f (diff)
downloadsamba-2f8b84bda040edc87a7af29c3a281cf335e392cb.tar.gz
samba-2f8b84bda040edc87a7af29c3a281cf335e392cb.tar.xz
samba-2f8b84bda040edc87a7af29c3a281cf335e392cb.zip
Fixed extra file_free calls - my fault :-(.
Jeremy.
Diffstat (limited to 'source/printing')
-rw-r--r--source/printing/nt_printing.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c
index 45080f8acc2..5e28f3e5b60 100644
--- a/source/printing/nt_printing.c
+++ b/source/printing/nt_printing.c
@@ -645,18 +645,14 @@ static uint32 get_correct_cversion(fstring architecture, fstring driverpath_in,
driverpath, cversion));
close_file(fsp, True);
- file_free(fsp);
close_cnum(conn, user->vuid);
pop_sec_ctx();
return cversion;
error_exit:
- if(fsp) {
- if(fsp->fd != -1)
- close_file(fsp, True);
- file_free(fsp);
- }
+ if(fsp)
+ close_file(fsp, True);
close_cnum(conn, user->vuid);
pop_sec_ctx();
@@ -1139,8 +1135,6 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file,
}
}
close_file(fsp, True);
- file_free(fsp);
-
/* Get file version info (if available) for new file */
pstrcpy(filepath, new_file);
@@ -1170,7 +1164,6 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file,
}
}
close_file(fsp, True);
- file_free(fsp);
if (use_version) {
/* Compare versions and choose the larger version number */
@@ -1198,11 +1191,8 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file,
}
error_exit:
- if(fsp) {
- file_free(fsp);
- if(fsp->fd != -1)
- close_file(fsp, True);
- }
+ if(fsp)
+ close_file(fsp, True);
return -1;
}