summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-03-17 15:26:38 +0100
committerGünther Deschner <gd@samba.org>2009-03-17 18:39:55 +0100
commit5778a36357f1560b9a8e5828cf789be4357ceb0c (patch)
tree684b63d3ed610299bcdd002e12233b3356d27114
parent1e7f602f8c1c19761758eee4e3287d711ff6cf92 (diff)
downloadsamba-5778a36357f1560b9a8e5828cf789be4357ceb0c.tar.gz
samba-5778a36357f1560b9a8e5828cf789be4357ceb0c.tar.bz2
samba-5778a36357f1560b9a8e5828cf789be4357ceb0c.zip
s3-spoolss: rename convert_printer_info_new to convert_printer_info.
Guenther
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 4ac8c74f91..8e1d528c78 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -1791,8 +1791,8 @@ static bool printer_info2_to_nt_printer_info2(struct spoolss_SetPrinterInfo2 *r,
/****************************************************************************
****************************************************************************/
-static bool convert_printer_info_new(struct spoolss_SetPrinterInfoCtr *info_ctr,
- NT_PRINTER_INFO_LEVEL *printer)
+static bool convert_printer_info(struct spoolss_SetPrinterInfoCtr *info_ctr,
+ NT_PRINTER_INFO_LEVEL *printer)
{
bool ret;
@@ -1805,7 +1805,7 @@ static bool convert_printer_info_new(struct spoolss_SetPrinterInfoCtr *info_ctr,
if (!printer->info_2) {
printer->info_2 = TALLOC_ZERO_P(printer, NT_PRINTER_INFO_LEVEL_2);
if (!printer->info_2) {
- DEBUG(0,("convert_printer_info_new: "
+ DEBUG(0,("convert_printer_info: "
"talloc() failed!\n"));
return false;
}
@@ -5766,7 +5766,7 @@ static WERROR update_printer(pipes_struct *p, POLICY_HND *handle,
* just read from the tdb in the pointer 'printer'.
*/
- if (!convert_printer_info_new(info_ctr, printer)) {
+ if (!convert_printer_info(info_ctr, printer)) {
result = WERR_NOMEM;
goto done;
}
@@ -7182,7 +7182,7 @@ static WERROR spoolss_addprinterex_level_2(pipes_struct *p,
}
/* convert from UNICODE to ASCII - this allocates the info_2 struct inside *printer.*/
- if (!convert_printer_info_new(info_ctr, printer)) {
+ if (!convert_printer_info(info_ctr, printer)) {
free_a_printer(&printer, 2);
return WERR_NOMEM;
}