svn commit: samba r20498 - in branches: SAMBA_3_0/source/tdb/common SAMBA_3_0/source/utils SAMBA_3_0_24/source/tdb/common

[vlendec at samba.org]

Author: vlendec
Date: 2007-01-03 06:39:18 +0000 (Wed, 03 Jan 2007)
New Revision: 20498

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

Log:
Two 64-bit warnings
Modified:
   branches/SAMBA_3_0/source/tdb/common/io.c
   branches/SAMBA_3_0/source/utils/net_rpc_registry.c
   branches/SAMBA_3_0_24/source/tdb/common/io.c


Changeset:
Modified: branches/SAMBA_3_0/source/tdb/common/io.c
===================================================================
--- branches/SAMBA_3_0/source/tdb/common/io.c	2007-01-03 06:29:22 UTC (rev 20497)
+++ branches/SAMBA_3_0/source/tdb/common/io.c	2007-01-03 06:39:18 UTC (rev 20498)
@@ -124,8 +124,10 @@
 		if (ret != (ssize_t)len) {
 			/* Ensure ecode is set for log fn. */
 			tdb->ecode = TDB_ERR_IO;
-			TDB_LOG((tdb, TDB_DEBUG_FATAL,"tdb_read failed at %d len=%d ret=%d (%s) map_size=%d\n",
-				 off, len, ret, strerror(errno), (int)tdb->map_size));
+			TDB_LOG((tdb, TDB_DEBUG_FATAL,"tdb_read failed at %d "
+				 "len=%d ret=%d (%s) map_size=%d\n",
+				 (int)off, (int)len, ret, strerror(errno),
+				 (int)tdb->map_size));
 			return TDB_ERRCODE(TDB_ERR_IO, -1);
 		}
 	}

Modified: branches/SAMBA_3_0/source/utils/net_rpc_registry.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_rpc_registry.c	2007-01-03 06:29:22 UTC (rev 20497)
+++ branches/SAMBA_3_0/source/utils/net_rpc_registry.c	2007-01-03 06:39:18 UTC (rev 20498)
@@ -661,7 +661,7 @@
 		}
 		case REG_BINARY:
 			d_printf("Value      = %d bytes\n",
-				 v->v.binary.length);
+				 (int)v->v.binary.length);
 			break;
 		default:
 			d_printf("Value      = <unprintable>\n");

Modified: branches/SAMBA_3_0_24/source/tdb/common/io.c
===================================================================
--- branches/SAMBA_3_0_24/source/tdb/common/io.c	2007-01-03 06:29:22 UTC (rev 20497)
+++ branches/SAMBA_3_0_24/source/tdb/common/io.c	2007-01-03 06:39:18 UTC (rev 20498)
@@ -124,8 +124,10 @@
 		if (ret != (ssize_t)len) {
 			/* Ensure ecode is set for log fn. */
 			tdb->ecode = TDB_ERR_IO;
-			TDB_LOG((tdb, TDB_DEBUG_FATAL,"tdb_read failed at %d len=%d ret=%d (%s) map_size=%d\n",
-				 off, len, ret, strerror(errno), (int)tdb->map_size));
+			TDB_LOG((tdb, TDB_DEBUG_FATAL,"tdb_read failed at %d "
+				 "len=%d ret=%d (%s) map_size=%d\n",
+				 (int)off, (int)len, ret, strerror(errno),
+				 (int)tdb->map_size));
 			return TDB_ERRCODE(TDB_ERR_IO, -1);
 		}
 	}