summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2010-06-30 12:07:44 -0400
committerAndreas Schneider <asn@samba.org>2010-09-10 15:49:03 +0200
commit0e5b1a67d26f99ae6d6f5e05f968dd3107191791 (patch)
tree1f10ef9eff29177fe3134a403e45f78ed00c7930
parentc59961dd814965e1dedd172b5e11c31310b80cc7 (diff)
downloadsamba-0e5b1a67d26f99ae6d6f5e05f968dd3107191791.tar.gz
samba-0e5b1a67d26f99ae6d6f5e05f968dd3107191791.tar.bz2
samba-0e5b1a67d26f99ae6d6f5e05f968dd3107191791.zip
s3-spoolss: Rename session counter structure and use talloc.
Signed-off-by: Andreas Schneider <asn@samba.org>
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 8978971cfb..c1ede19fcf 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -59,15 +59,15 @@
static Printer_entry *printers_list;
-typedef struct _counter_printer_0 {
- struct _counter_printer_0 *next;
- struct _counter_printer_0 *prev;
+struct printer_session_counter {
+ struct printer_session_counter *next;
+ struct printer_session_counter *prev;
int snum;
uint32_t counter;
-} counter_printer_0;
+};
-static counter_printer_0 *counter_list;
+static struct printer_session_counter *counter_list;
static struct rpc_pipe_client *notify_cli_pipe; /* print notify back-channel pipe handle*/
static uint32_t smb_connections = 0;
@@ -3603,7 +3603,7 @@ static WERROR construct_printer_info0(TALLOC_CTX *mem_ctx,
int snum)
{
int count;
- counter_printer_0 *session_counter;
+ struct printer_session_counter *session_counter;
struct timeval setuptime;
print_status_struct status;
@@ -3623,9 +3623,8 @@ static WERROR construct_printer_info0(TALLOC_CTX *mem_ctx,
/* it's the first time, add it to the list */
if (session_counter == NULL) {
- session_counter = SMB_MALLOC_P(counter_printer_0);
+ session_counter = talloc_zero(counter_list, struct printer_session_counter);
W_ERROR_HAVE_NO_MEMORY(session_counter);
- ZERO_STRUCTP(session_counter);
session_counter->snum = snum;
session_counter->counter = 0;
DLIST_ADD(counter_list, session_counter);