rpms/e2tools/F-8 e2tools-printf-lld-64bit.patch, 1.2, 1.3 e2tools.spec, 1.5, 1.6

[Hans Ulrich Niedermann (ndim)]

Author: ndim

Update of /cvs/pkgs/rpms/e2tools/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7635

Modified Files:
	e2tools-printf-lld-64bit.patch e2tools.spec 
Log Message:
* Sat Dec  8 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.16-8.fc8.3
- Improving __u64 formatstring magic: Use macro from inttypes.h.


e2tools-printf-lld-64bit.patch:

Index: e2tools-printf-lld-64bit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/e2tools/F-8/e2tools-printf-lld-64bit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- e2tools-printf-lld-64bit.patch	8 Dec 2007 23:14:57 -0000	1.2
+++ e2tools-printf-lld-64bit.patch	9 Dec 2007 00:38:02 -0000	1.3
@@ -1,20 +1,23 @@
 diff -ru e2tools-0.0.16-orig/ls.c e2tools-0.0.16-lld/ls.c
 --- e2tools-0.0.16-orig/ls.c	2007-12-08 23:57:40.000000000 +0100
-+++ e2tools-0.0.16-lld/ls.c	2007-12-09 00:02:57.000000000 +0100
++++ e2tools-0.0.16-lld/ls.c	2007-12-09 01:32:12.000000000 +0100
 @@ -44,6 +44,7 @@
  #include "e2tools.h"
  #include "elist.h"
  #include <regex.h>
-+#include <limits.h>
++#include <inttypes.h>
  
  /*
   * list directory
-@@ -657,8 +658,13 @@
+@@ -657,8 +658,17 @@
    if (LINUX_S_ISDIR(info->inode.i_mode))
      printf("%7d", info->inode.i_size);
    else
 -    printf("%7lld", info->inode.i_size |
 -           ((__u64)info->inode.i_size_high << 32));
++    printf(PRIu64, (__u64)(info->inode.i_size |
++			   ((__u64)info->inode.i_size_high << 32)));
++#if 0
 +#if ULONG_MAX == 4294967295UL
 +    printf("%7llu", (__u64)(info->inode.i_size |
 +			    ((__u64)info->inode.i_size_high << 32)));
@@ -22,6 +25,7 @@
 +    printf("%7lu", (__u64)(info->inode.i_size |
 +			   ((__u64)info->inode.i_size_high << 32)));
 +#endif
++#endif
    printf(" %s %s\n", datestr, info->name);
  
  } /* end of long_disp */ 


Index: e2tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2tools/F-8/e2tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- e2tools.spec	8 Dec 2007 23:14:57 -0000	1.5
+++ e2tools.spec	9 Dec 2007 00:38:02 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           e2tools
 Version:        0.0.16
-Release:        8%{?dist}.2
+Release:        8%{?dist}.3
 Summary:        Manipulate files in unmounted ext2/ext3 filesystems
 
 Group:          Applications/System
@@ -100,8 +100,8 @@
 
 
 %changelog
-* Sat Dec  8 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.16-8.fc8.2
-- Improving __u64 formatstring magic: Test ULONG_MAX now.
+* Sat Dec  8 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.16-8.fc8.3
+- Improving __u64 formatstring magic: Use macro from inttypes.h.
 
 * Sat Dec  8 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.16-8
 - Special __u64 formatstring on 64bit platforms (#349851).