diff options
author | Andrew Tridgell <tridge@samba.org> | 2009-03-23 11:47:38 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2009-03-23 11:47:38 +1100 |
commit | 7f113904eba5361d963075bcea7e36fd98ca34aa (patch) | |
tree | 2d5f22f3418a3439c306b3aaf570f52ff1d0823e /source3/printing/nt_printing.c | |
parent | 9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3 (diff) | |
parent | 979a1b06d01817a01967d9137e4f70f222fa8eab (diff) | |
download | samba-7f113904eba5361d963075bcea7e36fd98ca34aa.tar.gz samba-7f113904eba5361d963075bcea7e36fd98ca34aa.tar.xz samba-7f113904eba5361d963075bcea7e36fd98ca34aa.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/printing/nt_printing.c')
-rw-r--r-- | source3/printing/nt_printing.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 8e6fe1f364..a99485d381 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -2275,7 +2275,9 @@ static WERROR get_a_printer_driver_3_default(NT_PRINTER_DRIVER_INFO_LEVEL_3 **in /**************************************************************************** ****************************************************************************/ -static WERROR get_a_printer_driver_3(NT_PRINTER_DRIVER_INFO_LEVEL_3 **info_ptr, fstring drivername, const char *arch, uint32 version) +static WERROR get_a_printer_driver_3(NT_PRINTER_DRIVER_INFO_LEVEL_3 **info_ptr, + const char *drivername, const char *arch, + uint32_t version) { NT_PRINTER_DRIVER_INFO_LEVEL_3 driver; TDB_DATA dbuf; @@ -4448,7 +4450,7 @@ bool set_driver_init(NT_PRINTER_INFO_LEVEL *printer, uint32 level) Delete driver init data stored for a specified driver ****************************************************************************/ -bool del_driver_init(char *drivername) +bool del_driver_init(const char *drivername) { char *key; bool ret; @@ -4837,8 +4839,9 @@ uint32 add_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32 level) /**************************************************************************** ****************************************************************************/ -WERROR get_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL *driver, uint32 level, - fstring drivername, const char *architecture, uint32 version) +WERROR get_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL *driver, uint32_t level, + const char *drivername, const char *architecture, + uint32_t version) { WERROR result; |