[maemo-commits] [maemo-commits] r15157 - in projects/haf/trunk/dosfstools/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2008-02-08 09:26:22 +0200 (Fri, 08 Feb 2008)
New Revision: 15157

Added:
   projects/haf/trunk/dosfstools/debian/patches/09-silence-printf-warnings.patch
Modified:
   projects/haf/trunk/dosfstools/debian/changelog
Log:
patch from Eero


Modified: projects/haf/trunk/dosfstools/debian/changelog
===================================================================
--- projects/haf/trunk/dosfstools/debian/changelog	2008-02-07 15:45:25 UTC (rev 15156)
+++ projects/haf/trunk/dosfstools/debian/changelog	2008-02-08 07:26:22 UTC (rev 15157)
@@ -1,3 +1,9 @@
+dosfstools (2.11-0osso8~unreleased) unstable; urgency=low
+
+  * Silence printf warnings. Patch from Eero.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri,  8 Feb 2008 09:19:33 +0200
+
 dosfstools (2.11-0osso7) unstable; urgency=low
 
   * Added patches from Debian (2.11-2.3). Fixes: NB#79621

Added: projects/haf/trunk/dosfstools/debian/patches/09-silence-printf-warnings.patch
===================================================================
--- projects/haf/trunk/dosfstools/debian/patches/09-silence-printf-warnings.patch	2008-02-07 15:45:25 UTC (rev 15156)
+++ projects/haf/trunk/dosfstools/debian/patches/09-silence-printf-warnings.patch	2008-02-08 07:26:22 UTC (rev 15157)
@@ -0,0 +1,22 @@
+--- dosfstools-2.11/dosfsck/check.c.orig	2008-02-07 16:11:26.000000000 +0200
++++ dosfstools-2.11/dosfsck/check.c	2008-02-07 16:13:22.000000000 +0200
+@@ -315,8 +315,8 @@
+     first = file->parent ? file->parent->first : root;
+     number = 0;
+     while (1) {
+-	sprintf(file->dir_ent.name, "FSCK%04d", number / 1000);
+-	sprintf(file->dir_ent.name, "%03d", number % 1000);
++	sprintf(file->dir_ent.name, "FSCK%04ld", number / 1000);
++	sprintf(file->dir_ent.name, "%03ld", number % 1000);
+ 	for (walk = first; walk; walk = walk->next)
+ 	    if (walk != file && !strncmp(walk->dir_ent.name,file->dir_ent.
+ 	      name,MSDOS_NAME)) break;
+@@ -535,7 +535,7 @@
+     if (!(file->dir_ent.attr & ATTR_DIR) && CF_LE_L(file->dir_ent.size) >
+       (unsigned long long)clusters*fs->cluster_size) {
+ 	printf("%s\n  File size is %u bytes, cluster chain length is %llu bytes."
+-	  "\n  Truncating file to %lu bytes.\n",path_name(file),CF_LE_L(file->
++	  "\n  Truncating file to %llu bytes.\n",path_name(file),CF_LE_L(file->
+ 	  dir_ent.size),(unsigned long long)clusters*fs->cluster_size,(unsigned long long)clusters*fs->cluster_size);
+ 	MODIFY(file,size,CT_LE_L((unsigned long long)clusters*fs->cluster_size));
+     }