diff options
author | Andrew Bartlett <abartlet@samba.org> | 2003-01-14 08:53:59 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2003-01-14 08:53:59 +0000 |
commit | 27b7e51a3cc619f879655a3230611457ac43b9e7 (patch) | |
tree | 7aeb0ed6623ea91092320f13bb12eb167c446809 /source3/rpc_server/srv_spoolss_nt.c | |
parent | d645041d6345ff2802dd2f06ebed1d8f456fee23 (diff) | |
download | samba-27b7e51a3cc619f879655a3230611457ac43b9e7.tar.gz samba-27b7e51a3cc619f879655a3230611457ac43b9e7.tar.bz2 samba-27b7e51a3cc619f879655a3230611457ac43b9e7.zip |
Merge from HEAD:
- fstring/pstring mixups
- the detection code that found them (disabled)
- a bit of whitespace
- a static
Andrew Bartlett
(This used to be commit 9b70fa868e7d9481f584c83fc4046174e1dedfd9)
Diffstat (limited to 'source3/rpc_server/srv_spoolss_nt.c')
-rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index a289de78de..b44910883c 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -262,7 +262,7 @@ static void free_printer_entry(void *ptr) Functions to duplicate a SPOOL_NOTIFY_OPTION struct stored in Printer_entry. ****************************************************************************/ -SPOOL_NOTIFY_OPTION *dup_spool_notify_option(SPOOL_NOTIFY_OPTION *sp) +static SPOOL_NOTIFY_OPTION *dup_spool_notify_option(SPOOL_NOTIFY_OPTION *sp) { SPOOL_NOTIFY_OPTION *new_sp = NULL; @@ -1011,12 +1011,12 @@ static void send_notify2_changes( SPOOLSS_NOTIFY_MSG_CTR *ctr, uint32 idx ) switch(msg->type) { case PRINTER_NOTIFY_TYPE: if ( printer_notify_table[msg->field].fn ) - printer_notify_table[msg->field].fn(msg, &data[data_len], mem_ctx); + printer_notify_table[msg->field].fn(msg, &data[data_len], mem_ctx); break; case JOB_NOTIFY_TYPE: if ( job_notify_table[msg->field].fn ) - job_notify_table[msg->field].fn(msg, &data[data_len], mem_ctx); + job_notify_table[msg->field].fn(msg, &data[data_len], mem_ctx); break; default: @@ -5409,7 +5409,7 @@ WERROR _spoolss_getprinterdriver2(pipes_struct *p, SPOOL_Q_GETPRINTERDRIVER2 *q_ *servermajorversion = 0; *serverminorversion = 0; - pstrcpy(servername, get_called_name()); + fstrcpy(servername, get_called_name()); unistr2_to_ascii(architecture, uni_arch, sizeof(architecture)-1); if (!get_printer_snum(p, handle, &snum)) |