Removed unneccessary ()'s afer &'s that made it look like we

don't know how the C language works :-).
Jeremy
(This used to be commit d47329649d4f92a52acac7de256d9d9b0afc33c8)

1 files changed, 125 insertions, 125 deletions

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index de20b684cc..fa065048ed 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -344,6 +344,10 @@ static BOOL smb_io_notify_info_data(char *desc,SPOOL_NOTIFY_INFO_DATA *data, prs
 		return False;
 	if(!prs_uint32("id",             ps, depth, &data->id))
 		return False;
+#if 1 /* JRATEST - NEEDED ???? */
+	if(!prs_uint32("how many words", ps, depth, &how_many_words))
+		return False;
+#endif /* JRATEST - NEEDED ???? */
 
 	/*prs_align(ps);*/
 
@@ -513,75 +517,74 @@ static BOOL spoolss_io_devmode(char *desc, prs_struct *ps, int depth, DEVICEMODE
 
 	if (!prs_uint16s(True,"devicename", ps, depth, devmode->devicename.buffer, 32))
 		return False;
-	if (!prs_uint16("specversion",      ps, depth, &(devmode->specversion)))
+	if (!prs_uint16("specversion",      ps, depth, &devmode->specversion))
 		return False;
-	if (!prs_uint16("driverversion",    ps, depth, &(devmode->driverversion)))
+	if (!prs_uint16("driverversion",    ps, depth, &devmode->driverversion))
 		return False;
-	if (!prs_uint16("size",             ps, depth, &(devmode->size)))
+	if (!prs_uint16("size",             ps, depth, &devmode->size))
 		return False;
-	if (!prs_uint16("driverextra",      ps, depth, &(devmode->driverextra)))
+	if (!prs_uint16("driverextra",      ps, depth, &devmode->driverextra))
 		return False;
-	if (!prs_uint32("fields",           ps, depth, &(devmode->fields)))
+	if (!prs_uint32("fields",           ps, depth, &devmode->fields))
 		return False;
-	if (!prs_uint16("orientation",      ps, depth, &(devmode->orientation)))
+	if (!prs_uint16("orientation",      ps, depth, &devmode->orientation))
 		return False;
-	if (!prs_uint16("papersize",        ps, depth, &(devmode->papersize)))
+	if (!prs_uint16("papersize",        ps, depth, &devmode->papersize))
 		return False;
-	if (!prs_uint16("paperlength",      ps, depth, &(devmode->paperlength)))
+	if (!prs_uint16("paperlength",      ps, depth, &devmode->paperlength))
 		return False;
-	if (!prs_uint16("paperwidth",       ps, depth, &(devmode->paperwidth)))
+	if (!prs_uint16("paperwidth",       ps, depth, &devmode->paperwidth))
 		return False;
-	if (!prs_uint16("scale",            ps, depth, &(devmode->scale)))
+	if (!prs_uint16("scale",            ps, depth, &devmode->scale))
 		return False;
-	if (!prs_uint16("copies",           ps, depth, &(devmode->copies)))
+	if (!prs_uint16("copies",           ps, depth, &devmode->copies))
 		return False;
-	if (!prs_uint16("defaultsource",    ps, depth, &(devmode->defaultsource)))
+	if (!prs_uint16("defaultsource",    ps, depth, &devmode->defaultsource))
 		return False;
-	if (!prs_uint16("printquality",     ps, depth, &(devmode->printquality)))
+	if (!prs_uint16("printquality",     ps, depth, &devmode->printquality))
 		return False;
-	if (!prs_uint16("color",            ps, depth, &(devmode->color)))
+	if (!prs_uint16("color",            ps, depth, &devmode->color))
 		return False;
-	if (!prs_uint16("duplex",           ps, depth, &(devmode->duplex)))
+	if (!prs_uint16("duplex",           ps, depth, &devmode->duplex))
 		return False;
-	if (!prs_uint16("yresolution",      ps, depth, &(devmode->yresolution)))
+	if (!prs_uint16("yresolution",      ps, depth, &devmode->yresolution))
 		return False;
-	if (!prs_uint16("ttoption",         ps, depth, &(devmode->ttoption)))
+	if (!prs_uint16("ttoption",         ps, depth, &devmode->ttoption))
 		return False;
-	if (!prs_uint16("collate",          ps, depth, &(devmode->collate)))
+	if (!prs_uint16("collate",          ps, depth, &devmode->collate))
 		return False;
 	if (!prs_uint16s(True, "formname",  ps, depth, devmode->formname.buffer, 32))
 		return False;
-	if (!prs_uint16("logpixels",        ps, depth, &(devmode->logpixels)))
+	if (!prs_uint16("logpixels",        ps, depth, &devmode->logpixels))
 		return False;
-	if (!prs_uint32("bitsperpel",       ps, depth, &(devmode->bitsperpel)))
+	if (!prs_uint32("bitsperpel",       ps, depth, &devmode->bitsperpel))
 		return False;
-	if (!prs_uint32("pelswidth",        ps, depth, &(devmode->pelswidth)))
+	if (!prs_uint32("pelswidth",        ps, depth, &devmode->pelswidth))
 		return False;
-	if (!prs_uint32("pelsheight",       ps, depth, &(devmode->pelsheight)))
+	if (!prs_uint32("pelsheight",       ps, depth, &devmode->pelsheight))
 		return False;
-	if (!prs_uint32("displayflags",     ps, depth, &(devmode->displayflags)))
+	if (!prs_uint32("displayflags",     ps, depth, &devmode->displayflags))
 		return False;
-	if (!prs_uint32("displayfrequency", ps, depth, &(devmode->displayfrequency)))
+	if (!prs_uint32("displayfrequency", ps, depth, &devmode->displayfrequency))
 		return False;
-	if (!prs_uint32("icmmethod",        ps, depth, &(devmode->icmmethod)))
+	if (!prs_uint32("icmmethod",        ps, depth, &devmode->icmmethod))
 		return False;
-	if (!prs_uint32("icmintent",        ps, depth, &(devmode->icmintent)))
+	if (!prs_uint32("icmintent",        ps, depth, &devmode->icmintent))
 		return False;
-	if (!prs_uint32("mediatype",        ps, depth, &(devmode->mediatype)))
+	if (!prs_uint32("mediatype",        ps, depth, &devmode->mediatype))
 		return False;
-	if (!prs_uint32("dithertype",       ps, depth, &(devmode->dithertype)))
+	if (!prs_uint32("dithertype",       ps, depth, &devmode->dithertype))
 		return False;
-	if (!prs_uint32("reserved1",        ps, depth, &(devmode->reserved1)))
+	if (!prs_uint32("reserved1",        ps, depth, &devmode->reserved1))
 		return False;
-	if (!prs_uint32("reserved2",        ps, depth, &(devmode->reserved2)))
+	if (!prs_uint32("reserved2",        ps, depth, &devmode->reserved2))
 		return False;
-	if (!prs_uint32("panningwidth",     ps, depth, &(devmode->panningwidth)))
+	if (!prs_uint32("panningwidth",     ps, depth, &devmode->panningwidth))
 		return False;
-	if (!prs_uint32("panningheight",    ps, depth, &(devmode->panningheight)))
+	if (!prs_uint32("panningheight",    ps, depth, &devmode->panningheight))
 		return False;
 
-	if (devmode->driverextra!=0)
-	{
+	if (devmode->driverextra!=0) {
 		if (UNMARSHALLING(ps)) {
 			devmode->private=(uint8 *)malloc(devmode->driverextra*sizeof(uint8));
 			if(devmode->private == NULL)
@@ -972,9 +975,9 @@ BOOL spoolss_io_r_startdocprinter(char *desc, SPOOL_R_STARTDOCPRINTER *r_u, prs_
 {
 	prs_debug(ps, depth, desc, "spoolss_io_r_startdocprinter");
 	depth++;
-	if(!prs_uint32("jobid", ps, depth, &(r_u->jobid)))
+	if(!prs_uint32("jobid", ps, depth, &r_u->jobid))
 		return False;
-	if(!prs_uint32("status", ps, depth, &(r_u->status)))
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
@@ -994,7 +997,7 @@ BOOL spoolss_io_q_enddocprinter(char *desc, SPOOL_Q_ENDDOCPRINTER *q_u, prs_stru
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth))
+	if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
 		return False;
 
 	return True;
@@ -1008,7 +1011,7 @@ BOOL spoolss_io_r_enddocprinter(char *desc, SPOOL_R_ENDDOCPRINTER *r_u, prs_stru
 {
 	prs_debug(ps, depth, desc, "spoolss_io_r_enddocprinter");
 	depth++;
-	if(!prs_uint32("status", ps, depth, &(r_u->status)))
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
@@ -1028,7 +1031,7 @@ BOOL spoolss_io_q_startpageprinter(char *desc, SPOOL_Q_STARTPAGEPRINTER *q_u, pr
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth))
+	if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
 		return False;
 
 	return True;
@@ -1042,7 +1045,7 @@ BOOL spoolss_io_r_startpageprinter(char *desc, SPOOL_R_STARTPAGEPRINTER *r_u, pr
 {
 	prs_debug(ps, depth, desc, "spoolss_io_r_startpageprinter");
 	depth++;
-	if(!prs_uint32("status", ps, depth, &(r_u->status)))
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
@@ -1062,7 +1065,7 @@ BOOL spoolss_io_q_endpageprinter(char *desc, SPOOL_Q_ENDPAGEPRINTER *q_u, prs_st
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth))
+	if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
 		return False;
 
 	return True;
@@ -1076,7 +1079,7 @@ BOOL spoolss_io_r_endpageprinter(char *desc, SPOOL_R_ENDPAGEPRINTER *r_u, prs_st
 {
 	prs_debug(ps, depth, desc, "spoolss_io_r_endpageprinter");
 	depth++;
-	if(!prs_uint32("status", ps, depth, &(r_u->status)))
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
@@ -1096,9 +1099,9 @@ BOOL spoolss_io_q_writeprinter(char *desc, SPOOL_Q_WRITEPRINTER *q_u, prs_struct
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth))
+	if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
 		return False;
-	if(!prs_uint32("buffer_size", ps, depth, &(q_u->buffer_size)))
+	if(!prs_uint32("buffer_size", ps, depth, &q_u->buffer_size))
 		return False;
 	
 	if (q_u->buffer_size!=0)
@@ -1111,7 +1114,7 @@ BOOL spoolss_io_q_writeprinter(char *desc, SPOOL_Q_WRITEPRINTER *q_u, prs_struct
 	}
 	if(!prs_align(ps))
 		return False;
-	if(!prs_uint32("buffer_size2", ps, depth, &(q_u->buffer_size2)))
+	if(!prs_uint32("buffer_size2", ps, depth, &q_u->buffer_size2))
 		return False;
 
 	return True;
@@ -1125,9 +1128,9 @@ BOOL spoolss_io_r_writeprinter(char *desc, SPOOL_R_WRITEPRINTER *r_u, prs_struct
 {
 	prs_debug(ps, depth, desc, "spoolss_io_r_writeprinter");
 	depth++;
-	if(!prs_uint32("buffer_written", ps, depth, &(r_u->buffer_written)))
+	if(!prs_uint32("buffer_written", ps, depth, &r_u->buffer_written))
 		return False;
-	if(!prs_uint32("status", ps, depth, &(r_u->status)))
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
@@ -1593,7 +1596,7 @@ static BOOL new_smb_io_reldevmode(char *desc, NEW_BUFFER *buffer, int depth, DEV
 		uint32 old_offset;
 		
 		/* read the offset */
-		if (!prs_uint32("offset", ps, depth, &(buffer->string_at_end)))
+		if (!prs_uint32("offset", ps, depth, &buffer->string_at_end))
 			return False;
 
 		old_offset = prs_offset(ps);
@@ -2027,23 +2030,23 @@ BOOL new_smb_io_form_1(char *desc, NEW_BUFFER *buffer, FORM_1 *info, int depth)
 		
 	buffer->struct_start=prs_offset(ps);
 	
-	if (!prs_uint32("flag", ps, depth, &(info->flag)))
+	if (!prs_uint32("flag", ps, depth, &info->flag))
 		return False;
 		
-	if (!new_smb_io_relstr("name", buffer, depth, &(info->name)))
+	if (!new_smb_io_relstr("name", buffer, depth, &info->name))
 		return False;
 
-	if (!prs_uint32("width", ps, depth, &(info->width)))
+	if (!prs_uint32("width", ps, depth, &info->width))
 		return False;
-	if (!prs_uint32("length", ps, depth, &(info->length)))
+	if (!prs_uint32("length", ps, depth, &info->length))
 		return False;
-	if (!prs_uint32("left", ps, depth, &(info->left)))
+	if (!prs_uint32("left", ps, depth, &info->left))
 		return False;
-	if (!prs_uint32("top", ps, depth, &(info->top)))
+	if (!prs_uint32("top", ps, depth, &info->top))
 		return False;
-	if (!prs_uint32("right", ps, depth, &(info->right)))
+	if (!prs_uint32("right", ps, depth, &info->right))
 		return False;
-	if (!prs_uint32("bottom", ps, depth, &(info->bottom)))
+	if (!prs_uint32("bottom", ps, depth, &info->bottom))
 		return False;
 
 	return True;
@@ -2266,7 +2269,7 @@ BOOL smb_io_printprocdatatype_info_1(char *desc, NEW_BUFFER *buffer, PRINTPROCDA
 ********************************************************************/  
 BOOL smb_io_printmonitor_info_1(char *desc, NEW_BUFFER *buffer, PRINTMONITOR_1 *info, int depth)
 {
-	prs_struct *ps=&(buffer->prs);
+	prs_struct *ps=&buffer->prs;
 
 	prs_debug(ps, depth, desc, "smb_io_printmonitor_info_1");
 	depth++;	
@@ -2545,14 +2548,14 @@ uint32 spoolss_size_form_1(FORM_1 *info)
 {
 	int size=0;
 
-	size+=size_of_uint32( &(info->flag) );
-	size+=size_of_relative_string( &(info->name) );
-	size+=size_of_uint32( &(info->width) );
-	size+=size_of_uint32( &(info->length) );
-	size+=size_of_uint32( &(info->left) );
-	size+=size_of_uint32( &(info->top) );
-	size+=size_of_uint32( &(info->right) );
-	size+=size_of_uint32( &(info->bottom) );
+	size+=size_of_uint32( &info->flag );
+	size+=size_of_relative_string( &info->name );
+	size+=size_of_uint32( &info->width );
+	size+=size_of_uint32( &info->length );
+	size+=size_of_uint32( &info->left );
+	size+=size_of_uint32( &info->top );
+	size+=size_of_uint32( &info->right );
+	size+=size_of_uint32( &info->bottom );
 
 	return size;
 }
@@ -2911,7 +2914,7 @@ BOOL spoolss_io_r_setprinter(char *desc, SPOOL_R_SETPRINTER *r_u, prs_struct *ps
 	if(!prs_align(ps))
 		return False;
 	
-	if(!prs_uint32("status", ps, depth, &(r_u->status)))
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
@@ -2988,7 +2991,7 @@ BOOL spoolss_io_r_fcpn(char *desc, SPOOL_R_FCPN *r_u, prs_struct *ps, int depth)
 	if(!prs_align(ps))
 		return False;
 	
-	if(!prs_uint32("status", ps, depth, &(r_u->status)))
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
@@ -3005,7 +3008,7 @@ BOOL spoolss_io_q_fcpn(char *desc, SPOOL_Q_FCPN *q_u, prs_struct *ps, int depth)
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth))
+	if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
 		return False;
 
 	return True;
@@ -3145,7 +3148,7 @@ BOOL spoolss_io_r_schedulejob(char *desc, SPOOL_R_SCHEDULEJOB *r_u, prs_struct *
 	if(!prs_align(ps))
 		return False;
 	
-	if(!prs_uint32("status", ps, depth, &(r_u->status)))
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
@@ -3161,9 +3164,9 @@ BOOL spoolss_io_q_schedulejob(char *desc, SPOOL_Q_SCHEDULEJOB *q_u, prs_struct *
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth))
+	if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
 		return False;
-	if(!prs_uint32("jobid", ps, depth, &(q_u->jobid)))
+	if(!prs_uint32("jobid", ps, depth, &q_u->jobid))
 		return False;
 
 	return True;
@@ -3179,7 +3182,7 @@ BOOL spoolss_io_r_setjob(char *desc, SPOOL_R_SETJOB *r_u, prs_struct *ps, int de
 	if(!prs_align(ps))
 		return False;
 	
-	if(!prs_uint32("status", ps, depth, &(r_u->status)))
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
@@ -3195,17 +3198,17 @@ BOOL spoolss_io_q_setjob(char *desc, SPOOL_Q_SETJOB *q_u, prs_struct *ps, int de
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth))
+	if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
 		return False;
-	if(!prs_uint32("jobid", ps, depth, &(q_u->jobid)))
+	if(!prs_uint32("jobid", ps, depth, &q_u->jobid))
 		return False;
 	/* 
 	 * level is usually 0. If (level!=0) then I'm in trouble !
 	 * I will try to generate setjob command with level!=0, one day.
 	 */
-	if(!prs_uint32("level", ps, depth, &(q_u->level)))
+	if(!prs_uint32("level", ps, depth, &q_u->level))
 		return False;
-	if(!prs_uint32("command", ps, depth, &(q_u->command)))
+	if(!prs_uint32("command", ps, depth, &q_u->command))
 		return False;
 
 	return True;
@@ -3292,9 +3295,9 @@ BOOL spoolss_io_q_enumforms(char *desc, SPOOL_Q_ENUMFORMS *q_u, prs_struct *ps,
 
 	if (!prs_align(ps))
 		return False;			
-	if (!smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth))
+	if (!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
 		return False;		
-	if (!prs_uint32("level", ps, depth, &(q_u->level)))
+	if (!prs_uint32("level", ps, depth, &q_u->level))
 		return False;	
 	
 	if (!new_spoolss_io_buffer("", ps, depth, q_u->buffer))
@@ -3302,7 +3305,7 @@ BOOL spoolss_io_q_enumforms(char *desc, SPOOL_Q_ENUMFORMS *q_u, prs_struct *ps,
 
 	if (!prs_align(ps))
 		return False;
-	if (!prs_uint32("offered", ps, depth, &(q_u->offered)))
+	if (!prs_uint32("offered", ps, depth, &q_u->offered))
 		return False;
 
 	return True;
@@ -3324,13 +3327,13 @@ BOOL new_spoolss_io_r_enumforms(char *desc, SPOOL_R_ENUMFORMS *r_u, prs_struct *
 	if (!prs_align(ps))
 		return False;
 		
-	if (!prs_uint32("size of buffer needed", ps, depth, &(r_u->needed)))
+	if (!prs_uint32("size of buffer needed", ps, depth, &r_u->needed))
 		return False;
 		
-	if (!prs_uint32("numofforms", ps, depth, &(r_u->numofforms)))
+	if (!prs_uint32("numofforms", ps, depth, &r_u->numofforms))
 		return False;
 		
-	if (!prs_uint32("status", ps, depth, &(r_u->status)))
+	if (!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
@@ -3622,7 +3625,7 @@ BOOL spoolss_io_q_addprinterex(char *desc, SPOOL_Q_ADDPRINTEREX *q_u, prs_struct
 	if(!prs_uint32("info_level", ps, depth, &q_u->level))
 		return False;
 	
-	if(!spool_io_printer_info_level("", &(q_u->info), ps, depth))
+	if(!spool_io_printer_info_level("", &q_u->info, ps, depth))
 		return False;
 	
 	/* the 4 unknown are all 0 */
@@ -3659,10 +3662,10 @@ BOOL spoolss_io_r_addprinterex(char *desc, SPOOL_R_ADDPRINTEREX *r_u, prs_struct
 	prs_debug(ps, depth, desc, "spoolss_io_r_addprinterex");
 	depth++;
 	
-	if(!smb_io_pol_hnd("printer handle",&(r_u->handle),ps,depth))
+	if(!smb_io_pol_hnd("printer handle",&r_u->handle,ps,depth))
 		return False;
 
-	if(!prs_uint32("status", ps, depth, &(r_u->status)))
+	if(!prs_uint32("status", ps, depth, &r_u->status))
 		return False;
 
 	return True;
@@ -3951,7 +3954,7 @@ BOOL smb_io_unibuffer(char *desc, UNISTR2 *buffer, prs_struct *ps, int depth)
 	buffer->undoc=0;
 	buffer->uni_str_len=buffer->uni_max_len;
 	
-	if(!prs_uint32("buffer_size", ps, depth, &(buffer->uni_max_len)))
+	if(!prs_uint32("buffer_size", ps, depth, &buffer->uni_max_len))
 		return False;
 
 	if(!prs_unistr2(True, "buffer     ", ps, depth, buffer))
@@ -4078,14 +4081,14 @@ BOOL uni_2_asc_printer_driver_3(SPOOL_PRINTER_DRIVER_INFO_LEVEL_3 *uni,
 
 	d->cversion=uni->cversion;
 
-	unistr2_to_ascii(d->name,            &(uni->name),            sizeof(d->name)-1);
-	unistr2_to_ascii(d->environment,     &(uni->environment),     sizeof(d->environment)-1);
-	unistr2_to_ascii(d->driverpath,      &(uni->driverpath),      sizeof(d->driverpath)-1);
-	unistr2_to_ascii(d->datafile,        &(uni->datafile),        sizeof(d->datafile)-1);
-	unistr2_to_ascii(d->configfile,      &(uni->configfile),      sizeof(d->configfile)-1);
-	unistr2_to_ascii(d->helpfile,        &(uni->helpfile),        sizeof(d->helpfile)-1);
-	unistr2_to_ascii(d->monitorname,     &(uni->monitorname),     sizeof(d->monitorname)-1);
-	unistr2_to_ascii(d->defaultdatatype, &(uni->defaultdatatype), sizeof(d->defaultdatatype)-1);
+	unistr2_to_ascii(d->name,            &uni->name,            sizeof(d->name)-1);
+	unistr2_to_ascii(d->environment,     &uni->environment,     sizeof(d->environment)-1);
+	unistr2_to_ascii(d->driverpath,      &uni->driverpath,      sizeof(d->driverpath)-1);
+	unistr2_to_ascii(d->datafile,        &uni->datafile,        sizeof(d->datafile)-1);
+	unistr2_to_ascii(d->configfile,      &uni->configfile,      sizeof(d->configfile)-1);
+	unistr2_to_ascii(d->helpfile,        &uni->helpfile,        sizeof(d->helpfile)-1);
+	unistr2_to_ascii(d->monitorname,     &uni->monitorname,     sizeof(d->monitorname)-1);
+	unistr2_to_ascii(d->defaultdatatype, &uni->defaultdatatype, sizeof(d->defaultdatatype)-1);
 
 	DEBUGADD(8,( "version:         %d\n", d->cversion));
 	DEBUGADD(8,( "name:            %s\n", d->name));
@@ -4528,7 +4531,7 @@ BOOL make_spoolss_q_enumprinterdata(SPOOL_Q_ENUMPRINTERDATA *q_u,
 		const POLICY_HND *hnd,
 		uint32 idx, uint32 valuelen, uint32 datalen)
 {
-	memcpy(&(q_u->handle), hnd, sizeof(q_u->handle));
+	memcpy(&q_u->handle, hnd, sizeof(q_u->handle));
 	q_u->index=idx;
 	q_u->valuesize=valuelen;
 	q_u->datasize=datalen;
@@ -4646,24 +4649,24 @@ static BOOL spoolss_io_addform(char *desc, FORM *f, uint32 ptr, prs_struct *ps,
 
 	if (ptr!=0)
 	{
-		if(!prs_uint32("flags",    ps, depth, &(f->flags)))
+		if(!prs_uint32("flags",    ps, depth, &f->flags))
 			return False;
-		if(!prs_uint32("name_ptr", ps, depth, &(f->name_ptr)))
+		if(!prs_uint32("name_ptr", ps, depth, &f->name_ptr))
 			return False;
-		if(!prs_uint32("size_x",   ps, depth, &(f->size_x)))
+		if(!prs_uint32("size_x",   ps, depth, &f->size_x))
 			return False;
-		if(!prs_uint32("size_y",   ps, depth, &(f->size_y)))
+		if(!prs_uint32("size_y",   ps, depth, &f->size_y))
 			return False;
-		if(!prs_uint32("left",     ps, depth, &(f->left)))
+		if(!prs_uint32("left",     ps, depth, &f->left))
 			return False;
-		if(!prs_uint32("top",      ps, depth, &(f->top)))
+		if(!prs_uint32("top",      ps, depth, &f->top))
 			return False;
-		if(!prs_uint32("right",    ps, depth, &(f->right)))
+		if(!prs_uint32("right",    ps, depth, &f->right))
 			return False;
-		if(!prs_uint32("bottom",   ps, depth, &(f->bottom)))
+		if(!prs_uint32("bottom",   ps, depth, &f->bottom))
 			return False;
 
-		if(!smb_io_unistr2("", &(f->name), f->name_ptr, ps, depth))
+		if(!smb_io_unistr2("", &f->name, f->name_ptr, ps, depth))
 			return False;
 	}
 
@@ -4680,18 +4683,18 @@ BOOL spoolss_io_q_addform(char *desc, SPOOL_Q_ADDFORM *q_u, prs_struct *ps, int
 
 	if(!prs_align(ps))
 		return False;
-	if(!smb_io_pol_hnd("printer handle", &(q_u->handle), ps, depth))
+	if(!smb_io_pol_hnd("printer handle", &q_u->handle, ps, depth))
 		return False;
-	if(!prs_uint32("level",  ps, depth, &(q_u->level)))
+	if(!prs_uint32("level",  ps, depth, &q_u->level))
 		return False;
-	if(!prs_uint32("level2", ps, depth, &(q_u->level2)))
+	if(!prs_uint32("level2", ps, depth, &q_u->level2))
 		return False;
 
 	if (q_u->level==1)
 	{
-		if(!prs_uint32("useless_ptr", ps, depth, &(useless_ptr)))
+		if(!prs_uint32("useless_ptr", ps, depth, &useless_ptr))
 			return False;
-		if(!spoolss_io_addform("", &(q_u->form), useless_ptr, ps, depth))
+		if(!spoolss_io_addform("", &q_u->form, useless_ptr, ps, depth))
 			return False;
 	}
 
@@ -4707,7 +4710,7 @@ BOOL spoolss_io_r_addform(char *desc, SPOOL_R_ADDFORM *r_u, prs_struct *ps, int
 
 	if(!prs_align(ps))
 		return False;
-	if(!prs_uint32("status",	ps, depth, &(r_u->status)))
+	if(!prs_uint32("status",	ps, depth, &r_u->status))
 		return False;
 
 	return True;
@@ -4723,24 +4726,24 @@ BOOL spoolss_io_q_setform(char *desc, SPOOL_Q_SETFORM *q_u, prs_struct *ps, int
 
 	if(!prs_align(ps))
 		return False;
-	if(!smb_io_pol_hnd("printer handle", &(q_u->handle), ps, depth))
+	if(!smb_io_pol_hnd("printer handle", &q_u->handle, ps, depth))
 		return False;
-	if(!smb_io_unistr2("", &(q_u->name), True, ps, depth))
+	if(!smb_io_unistr2("", &q_u->name, True, ps, depth))
 		return False;
 	      
 	if(!prs_align(ps))
 		return False;
 	
-	if(!prs_uint32("level",  ps, depth, &(q_u->level)))
+	if(!prs_uint32("level",  ps, depth, &q_u->level))
 		return False;
-	if(!prs_uint32("level2", ps, depth, &(q_u->level2)))
+	if(!prs_uint32("level2", ps, depth, &q_u->level2))
 		return False;
 
 	if (q_u->level==1)
 	{
-		if(!prs_uint32("useless_ptr", ps, depth, &(useless_ptr)))
+		if(!prs_uint32("useless_ptr", ps, depth, &useless_ptr))
 			return False;
-		if(!spoolss_io_addform("", &(q_u->form), useless_ptr, ps, depth))
+		if(!spoolss_io_addform("", &q_u->form, useless_ptr, ps, depth))
 			return False;
 	}
 
@@ -4756,7 +4759,7 @@ BOOL spoolss_io_r_setform(char *desc, SPOOL_R_SETFORM *r_u, prs_struct *ps, int
 
 	if(!prs_align(ps))
 		return False;
-	if(!prs_uint32("status",	ps, depth, &(r_u->status)))
+	if(!prs_uint32("status",	ps, depth, &r_u->status))
 		return False;
 
 	return True;
@@ -4799,7 +4802,7 @@ BOOL spoolss_io_q_getjob(char *desc, SPOOL_Q_GETJOB *q_u, prs_struct *ps, int de
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth))
+	if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
 		return False;
 	if(!prs_uint32("jobid", ps, depth, &q_u->jobid))
 		return False;
@@ -5024,7 +5027,7 @@ BOOL spoolss_io_q_replyopenprinter(char *desc, SPOOL_Q_REPLYOPENPRINTER *q_u, pr
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_unistr2("", &(q_u->string), True, ps, depth))
+	if(!smb_io_unistr2("", &q_u->string, True, ps, depth))
 		return False;
 
 	if(!prs_align(ps))
@@ -5052,7 +5055,7 @@ BOOL spoolss_io_r_replyopenprinter(char *desc, SPOOL_R_REPLYOPENPRINTER *r_u, pr
 	if (!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("printer handle",&(r_u->handle),ps,depth))
+	if(!smb_io_pol_hnd("printer handle",&r_u->handle,ps,depth))
 		return False;
 
 	if (!prs_uint32("status", ps, depth, &r_u->status))
@@ -5072,7 +5075,7 @@ BOOL spoolss_io_q_replycloseprinter(char *desc, SPOOL_Q_REPLYCLOSEPRINTER *q_u,
 	if(!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth))
+	if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
 		return False;
 
 	return True;
@@ -5089,7 +5092,7 @@ BOOL spoolss_io_r_replycloseprinter(char *desc, SPOOL_R_REPLYCLOSEPRINTER *r_u,
 	if (!prs_align(ps))
 		return False;
 
-	if(!smb_io_pol_hnd("printer handle",&(r_u->handle),ps,depth))
+	if(!smb_io_pol_hnd("printer handle",&r_u->handle,ps,depth))
 		return False;
 
 	if (!prs_uint32("status", ps, depth, &r_u->status))
@@ -5097,6 +5100,3 @@ BOOL spoolss_io_r_replycloseprinter(char *desc, SPOOL_R_REPLYCLOSEPRINTER *r_u,
 
 	return True;		
 }
-
-
-