[PATCH] Typo in tdb/tdbbackup.c

[Vance Lankhaar]

It's pretty self-explanatory.

Vance
-------------- next part --------------
? 3_0_source_passdb_pdb_ldap_c.patch
? build_options_autogen_SAMBA_3_0.patch
? sizeof_signedness_fix.patch
? tdbbackup_typo.diff
? passdb/3_0_source_passdb_pdb_ldap_c.patch
? script/mkproto.sh
Index: configure.in
===================================================================
RCS file: /cvsroot/samba/source/configure.in,v
retrieving revision 1.300.2.90
diff -u -r1.300.2.90 configure.in
--- configure.in	27 May 2003 02:35:53 -0000	1.300.2.90
+++ configure.in	11 Jun 2003 07:17:58 -0000
@@ -558,6 +558,7 @@
 AC_CHECK_SIZEOF(int,cross)
 AC_CHECK_SIZEOF(long,cross)
 AC_CHECK_SIZEOF(short,cross)
+AC_CHECK_SIZEOF(size_t,cross)
 
 AC_C_CONST
 AC_C_INLINE
Index: script/mkbuildoptions.awk
===================================================================
RCS file: /cvsroot/samba/source/script/Attic/mkbuildoptions.awk,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 mkbuildoptions.awk
--- script/mkbuildoptions.awk	29 Apr 2003 03:04:05 -0000	1.1.2.2
+++ script/mkbuildoptions.awk	11 Jun 2003 07:17:59 -0000
@@ -242,6 +242,28 @@
 	# add code to display the various type sizes
 	print "       /* Output the sizes of the various types */";
 	print "       output(screen, \"\\nType sizes:\\n\");";
+<<<<<<< mkbuildoptions.awk
+
+	print "       if (sizeof(size_t) == sizeof(unsigned int)) {";
+	print "               output(screen, \"   sizeof(char):    %u\\n\",sizeof(char));";
+	print "               output(screen, \"   sizeof(int):     %u\\n\",sizeof(int));";
+	print "               output(screen, \"   sizeof(long):    %u\\n\",sizeof(long));";
+	print "               output(screen, \"   sizeof(uint8):   %u\\n\",sizeof(uint8));";
+	print "               output(screen, \"   sizeof(uint16):  %u\\n\",sizeof(uint16));";
+	print "               output(screen, \"   sizeof(uint32):  %u\\n\",sizeof(uint32));";
+	print "               output(screen, \"   sizeof(short):   %u\\n\",sizeof(short));";
+	print "               output(screen, \"   sizeof(void*):   %u\\n\",sizeof(void*));";
+	print "       } else {";
+	print "               output(screen, \"   sizeof(char):    %lu\\n\",sizeof(char));";
+	print "               output(screen, \"   sizeof(int):     %lu\\n\",sizeof(int));";
+	print "               output(screen, \"   sizeof(long):    %lu\\n\",sizeof(long));";
+	print "               output(screen, \"   sizeof(uint8):   %lu\\n\",sizeof(uint8));";
+	print "               output(screen, \"   sizeof(uint16):  %lu\\n\",sizeof(uint16));";
+	print "               output(screen, \"   sizeof(uint32):  %lu\\n\",sizeof(uint32));";
+	print "               output(screen, \"   sizeof(short):   %lu\\n\",sizeof(short));";
+	print "               output(screen, \"   sizeof(void*):   %lu\\n\",sizeof(void*));";
+	print "       }";
+=======
 	print "       output(screen, \"   sizeof(char):    %u\\n\",sizeof(char));";
 	print "       output(screen, \"   sizeof(int):     %u\\n\",sizeof(int));";
 	print "       output(screen, \"   sizeof(long):    %u\\n\",sizeof(long));";
@@ -250,6 +272,7 @@
 	print "       output(screen, \"   sizeof(uint32):  %u\\n\",sizeof(uint32));";
 	print "       output(screen, \"   sizeof(short):   %u\\n\",sizeof(short));";
 	print "       output(screen, \"   sizeof(void*):   %u\\n\",sizeof(void*));";
+>>>>>>> 1.1.2.2
 
 	##################################################
 	# add code to give information about modules
Index: tdb/tdbbackup.c
===================================================================
RCS file: /cvsroot/samba/source/tdb/tdbbackup.c,v
retrieving revision 1.6.2.4
diff -u -r1.6.2.4 tdbbackup.c
--- tdb/tdbbackup.c	16 Apr 2003 13:19:51 -0000	1.6.2.4
+++ tdb/tdbbackup.c	11 Jun 2003 07:17:59 -0000
@@ -245,7 +245,7 @@
 	printf("Usage: tdbbackup [options] <fname...>\n\n");
 	printf("   -h            this help message\n");
 	printf("   -s suffix     set the backup suffix\n");
-	printf("   -v            veryify mode (restore if corrupt)\n");
+	printf("   -v            verify mode (restore if corrupt)\n");
 }