sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3fs-printing: Simplify the comment and location handling.

Browse Source 
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Oct 11 18:49:15 CEST 2012 on sn-devel-104
This commit is contained in:
Andreas Schneider 2012-10-11 14:46:56 +02:00 committed by Andreas Schneider
parent 49959cffc5
commit cabd2b2e96
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source3/printing/printer_list.c
View File

@ -148,8 +148,6 @@ NTSTATUS printer_list_set_printer(TALLOC_CTX *mem_ctx,
TDB_DATA data;
uint64_t time_64;
uint32_t time_h, time_l;
const char *str = NULL;
const char *str2 = NULL;
NTSTATUS status;
int len;
@ -164,24 +162,25 @@ NTSTATUS printer_list_set_printer(TALLOC_CTX *mem_ctx,
return NT_STATUS_NO_MEMORY;
}
if (comment) {
str = comment;
} else {
str = "";
if (comment == NULL) {
comment = "";
}
if (location) {
str2 = location;
} else {
str2 = "";
if (location == NULL) {
location = "";
}
time_64 = last_refresh;
time_l = time_64 & 0xFFFFFFFFL;
time_h = time_64 >> 32;
len = tdb_pack(NULL, 0, PL_DATA_FORMAT, time_h, time_l, name, str, str2);
len = tdb_pack(NULL, 0,
PL_DATA_FORMAT,
time_h,
time_l,
name,
comment,
location);
data.dptr = talloc_array(key, uint8_t, len);
if (!data.dptr) {
@ -192,7 +191,12 @@ NTSTATUS printer_list_set_printer(TALLOC_CTX *mem_ctx,
data.dsize = len;
len = tdb_pack(data.dptr, data.dsize,
PL_DATA_FORMAT, time_h, time_l, name, str, str2);
PL_DATA_FORMAT,
time_h,
time_l,
name,
comment,
location);
status = dbwrap_store_bystring_upper(db, key, data, TDB_REPLACE);