svn commit: samba r22957 - in branches: SAMBA_3_0_25/source/rpc_parse SAMBA_3_0_26/source/rpc_parse

[jra at samba.org]

Author: jra
Date: 2007-05-17 00:44:20 +0000 (Thu, 17 May 2007)
New Revision: 22957

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22957

Log:
Use 1 for pointer, instead of casting to a 32-bit value
from (potentially) a 64-bit pointer.
Jeremy.

Modified:
   branches/SAMBA_3_0_25/source/rpc_parse/parse_srv.c
   branches/SAMBA_3_0_26/source/rpc_parse/parse_srv.c


Changeset:
Modified: branches/SAMBA_3_0_25/source/rpc_parse/parse_srv.c
===================================================================
--- branches/SAMBA_3_0_25/source/rpc_parse/parse_srv.c	2007-05-16 22:52:17 UTC (rev 22956)
+++ branches/SAMBA_3_0_25/source/rpc_parse/parse_srv.c	2007-05-17 00:44:20 UTC (rev 22957)
@@ -2404,7 +2404,7 @@
 	if(!prs_uint32("num_locks    ", ps, depth, &fl3->num_locks))
 		return False;
 
-	uni_p = fl3->path ? (uint32)fl3->path : 0;
+	uni_p = fl3->path ? 1 : 0;
 	if(!prs_uint32("ptr", ps, depth, &uni_p))
 		return False;
 	if (UNMARSHALLING(ps)) {
@@ -2413,7 +2413,7 @@
 		}
 	}
 
-	uni_p = fl3->user ? (uint32)fl3->user : 0;
+	uni_p = fl3->user ? 1 : 0;
 	if(!prs_uint32("ptr", ps, depth, &uni_p))
 		return False;
 	if (UNMARSHALLING(ps)) {

Modified: branches/SAMBA_3_0_26/source/rpc_parse/parse_srv.c
===================================================================
--- branches/SAMBA_3_0_26/source/rpc_parse/parse_srv.c	2007-05-16 22:52:17 UTC (rev 22956)
+++ branches/SAMBA_3_0_26/source/rpc_parse/parse_srv.c	2007-05-17 00:44:20 UTC (rev 22957)
@@ -2404,7 +2404,7 @@
 	if(!prs_uint32("num_locks    ", ps, depth, &fl3->num_locks))
 		return False;
 
-	uni_p = fl3->path ? (uint32)fl3->path : 0;
+	uni_p = fl3->path ? 1 : 0;
 	if(!prs_uint32("ptr", ps, depth, &uni_p))
 		return False;
 	if (UNMARSHALLING(ps)) {
@@ -2413,7 +2413,7 @@
 		}
 	}
 
-	uni_p = fl3->user ? (uint32)fl3->user : 0;
+	uni_p = fl3->user ? 1 : 0;
 	if(!prs_uint32("ptr", ps, depth, &uni_p))
 		return False;
 	if (UNMARSHALLING(ps)) {