SOURCES: dvd+rw-tools-gcc4.patch (NEW) - printf format fixes.

pluto pluto at pld-linux.org
Sat Jan 28 14:04:14 CET 2006


Author: pluto                        Date: Sat Jan 28 13:04:13 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- printf format fixes.

---- Files affected:
SOURCES:
   dvd+rw-tools-gcc4.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/dvd+rw-tools-gcc4.patch
diff -u /dev/null SOURCES/dvd+rw-tools-gcc4.patch:1.1
--- /dev/null	Sat Jan 28 14:04:13 2006
+++ SOURCES/dvd+rw-tools-gcc4.patch	Sat Jan 28 14:04:08 2006
@@ -0,0 +1,83 @@
+--- dvd+rw-tools-5.21.4.10.8/growisofs.c.orig	2006-01-28 13:45:32.000000000 +0100
++++ dvd+rw-tools-5.21.4.10.8/growisofs.c	2006-01-28 13:50:40.665927750 +0100
+@@ -1354,8 +1354,8 @@
+     {	tracksize = dao_size ? (dao_size*CD_BLOCK) : sb.st_size;
+ 	progress->final=outoff+tracksize;
+ 	if (capacity && progress->final > capacity)
+-	{   fprintf (stderr,":-( %s: %lld blocks are free, "
+-			    "%lld to be written!\n",
++	{   fprintf (stderr,":-( %s: %zd blocks are free, "
++			    "%zd to be written!\n",
+ 			    ioctl_device,
+ 			    (capacity-outoff)/2048,tracksize/2048);
+ 	    if (overburn)
+@@ -1387,14 +1387,14 @@
+ 			(double)(current-outoff);
+ 		delta *= ratio - 1.0;
+ 		velocity=(current-lastcurrent)/(-slept*1024*1385);
+-		fprintf (stdout,"%10lld/%lld (%4.1f%%) @%.1fx, "
++		fprintf (stdout,"%10zd/%zd (%4.1f%%) @%.1fx, "
+ 				"remaining %d:%02d\n",
+ 				current,progress->final,100.0/ratio,
+ 				velocity,delta/60,delta%60);
+ 		lastcurrent=current;
+ 	    }
+ 	    else
+-		fprintf (stdout,"%10lld/%lld (%4.1f%%) @0x, remaining ??:??\n",
++		fprintf (stdout,"%10zd/%zd (%4.1f%%) @0x, remaining ??:??\n",
+ 				current,progress->final,0.0);
+ 	    fflush (stdout);
+ 	}
+@@ -1415,8 +1415,8 @@
+ 	        {   if (tracksize==0)
+ 		    {	tracksize=from_733(descr->volume_space_size)*CD_BLOCK;
+ 			if (capacity && (outoff+tracksize) > capacity)
+-		    	{   fprintf (stderr,":-( %s: %lld blocks are free, "
+-					    "%lld to be written\n",
++		    	{   fprintf (stderr,":-( %s: %zd blocks are free, "
++					    "%zd to be written\n",
+ 					    ioctl_device,
+ 					    (capacity-outoff)/2048,
+ 					    tracksize/2048);
+@@ -1542,7 +1542,7 @@
+ 	outoff += DVD_BLOCK;
+     }
+ 
+-    printf ("builtin_dd: %lld*2KB out @ average %.1fx1385KBps\n",
++    printf ("builtin_dd: %zd*2KB out @ average %.1fx1385KBps\n",
+ 	    (outoff-startoff)/2048,
+ 	    ((outoff-startoff)/(1024.0*1385.0))/(time(NULL)-progress->zero));
+ out:
+@@ -1941,7 +1941,7 @@
+ 
+ 			dup2(in_fd,imgfd);	/* kludge! */
+ 		    	if (lseek64 (imgfd,off,SEEK_SET) == (off64_t)-1)
+-			    fprintf (stderr,":-( %s: unable to lseek(%lld): ",
++			    fprintf (stderr,":-( %s: unable to lseek(%zd): ",
+ 					    in_device,off),
+ 			    perror (NULL), exit(FATAL_START(errno));
+ 		    } else if (alleged_next_session!=next_session)
+@@ -2135,10 +2135,10 @@
+ 
+ 	if (dev_found == 'F') {
+ 		off64_t capacity = 0;
+-		printf("next_session=%lld\n", next_session*CD_BLOCK);
++		printf("next_session=%zd\n", next_session*CD_BLOCK);
+ 		if (ioctl_handle!=INVALID_HANDLE)
+ 			capacity = get_capacity (ioctl_handle);
+-		printf("capacity=%lld\n", capacity);
++		printf("capacity=%zd\n", capacity);
+ 		exit(0);
+ 	}
+ 
+--- dvd+rw-tools-5.21.4.10.8/growisofs_mmc.cpp.orig	2004-07-16 14:48:57.000000000 +0200
++++ dvd+rw-tools-5.21.4.10.8/growisofs_mmc.cpp	2006-01-28 13:50:59.583110000 +0100
+@@ -91,7 +91,7 @@
+ 	if ((n=fcntl (ioctl_fd,F_GETFD))<0) n=0;
+ 	fcntl (ioctl_fd,F_SETFD,n&~FD_CLOEXEC);
+ 
+-	sprintf (str,"%d",ioctl_fd);
++	sprintf (str,"%ld",ioctl_fd);
+ 	execlp(_argv[0],"-reload",str,ioctl_device,NULL);
+     }
+     else
================================================================


More information about the pld-cvs-commit mailing list