Attachment #172598 for bug #211152

Lines 29-34 Link Here

(-)Makefile (-1 / +10 lines)
29	THREADS_LDFLAGS= -lpthread	29	THREADS_LDFLAGS= -lpthread
30	THREADS_CFLAGS_OFF= -DNO_THREADS	30	THREADS_CFLAGS_OFF= -DNO_THREADS
31		31
		32	.include <bsd.port.pre.mk>
		33
		34	post-patch:
		35	# Remove line 363 "typedef long long off64_t;" from iozone.c
		36	# Please, on update checK if it is the same line-number
		37	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100000
		38	@${REINPLACE_CMD} -e '363d' ${WRKSRC}/iozone.c
		39	.endif
		40
32	post-patch-SSH-on:	41	post-patch-SSH-on:
33	@${REINPLACE_CMD} -e 's\|shell\,\"rsh\"\|shell\,\"ssh\"\|' \	42	@${REINPLACE_CMD} -e 's\|shell\,\"rsh\"\|shell\,\"ssh\"\|' \
34	${WRKSRC}/iozone.c	43	${WRKSRC}/iozone.c
Lines 38-41 Link Here
38	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 \	47	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 \
39	${STAGEDIR}${MAN1PREFIX}/man/man1	48	${STAGEDIR}${MAN1PREFIX}/man/man1
40		49
41	.include <bsd.port.mk>	50	.include <bsd.port.post.mk>




--- iozone.c.orig	2016-07-16 17:05:13 UTC
+++ iozone.c
@@ -1916,7 +1916,7 @@ char **argv;
 			break;
 		case 's': 	/* Set file size */
 #ifdef NO_PRINT_LLD
-			sscanf(optarg,"%ld",&kilobytes64);
+			sscanf(optarg,"%ld",(long long *)&kilobytes64);
 #else
 			sscanf(optarg,"%lld",&kilobytes64);
 #endif
@@ -1940,7 +1940,7 @@ char **argv;
 			min_file_size = (off64_t)s_range[0];   /* Make visable globally */
 
 #ifdef NO_PRINT_LLD
-	    		sprintf(splash[splash_line++],"\tFile size set to %ld kB\n",kilobytes64);
+	    		sprintf(splash[splash_line++],"\tFile size set to %ld kB\n",(long long )kilobytes64);
 #else
 	    		sprintf(splash[splash_line++],"\tFile size set to %lld kB\n",kilobytes64);
 #endif
@@ -2314,7 +2314,7 @@ char **argv;
 			if(minimum_file_size < page_size/1024)
 				minimum_file_size=(off64_t)(page_size/1024);
 #ifdef NO_PRINT_LLD
-			sprintf(splash[splash_line++],"\tUsing minimum file size of %ld kilobytes.\n",minimum_file_size);
+			sprintf(splash[splash_line++],"\tUsing minimum file size of %ld (long long)kilobytes.\n",minimum_file_size);
 #else
 			sprintf(splash[splash_line++],"\tUsing minimum file size of %lld kilobytes.\n",minimum_file_size);
 #endif
@@ -2337,7 +2337,7 @@ char **argv;
 			if(maximum_file_size < RECLEN_START/1024)
 				maximum_file_size=(off64_t)(RECLEN_START/1024);
 #ifdef NO_PRINT_LLD
-			sprintf(splash[splash_line++],"\tUsing maximum file size of %ld kilobytes.\n",maximum_file_size);
+			sprintf(splash[splash_line++],"\tUsing maximum file size of %ld (long long)kilobytes.\n",maximum_file_size);
 #else
 			sprintf(splash[splash_line++],"\tUsing maximum file size of %lld kilobytes.\n",maximum_file_size);
 #endif
@@ -2447,7 +2447,7 @@ char **argv;
 					#ifdef NO_PRINT_LLD
 						sscanf(subarg,"%ld",&burst_size_kb_64);
 					#else
-						sscanf(subarg,"%lld",&burst_size_kb_64);
+						sscanf(subarg,"%lld",(long long *)&burst_size_kb_64);
 					#endif
 					if(subarg[strlen(subarg)-1]=='k' ||
 						subarg[strlen(subarg)-1]=='K'){
@@ -3109,7 +3109,7 @@ char **argv;
 		burst_size_kb_64, burst_sleep_duration_msec);
 #else
 		printf("\tBurst size set to %lld Kbytes.\n\tBurst sleep duration set to %lld msec\n",
-		burst_size_kb_64, burst_sleep_duration_msec);
+		(long long)burst_size_kb_64, burst_sleep_duration_msec);
 #endif
 	if(!rflag)
 		reclen=(long long)4096;
@@ -3345,7 +3345,7 @@ long long reclength;
 		if(!silent) printf("%8ld",reclen/1024);
 	}
 #else
-	if(!silent) printf("%16lld",kilobytes64);
+	if(!silent) printf("%16lld",(long long)kilobytes64);
 	if(r_traj_flag || w_traj_flag)
 	{
 		if(!silent) printf("%8lld",(long long )0);
@@ -3403,7 +3403,7 @@ long long reclength;
 	    	printf("\n\tiozone %ld %ld ", kilobytes64,  goodrecl);
 	    	printf("\t(i.e. record size = %ld bytes)\n",  goodrecl);
 #else
-	    	printf("\n\tiozone %lld %lld ", kilobytes64,  goodrecl);
+	    	printf("\n\tiozone %lld %lld ", (long long)kilobytes64,  goodrecl);
 	    	printf("\t(i.e. record size = %lld bytes)\n",  goodrecl);
 #endif
 	   }
@@ -3544,7 +3544,7 @@ void auto_test()
                                 min_rec_size,min_file_size);
 #else
             printf("Error: record length %lld is greater than filesize %lld kB\n ",
-                                min_rec_size,min_file_size);
+                                min_rec_size,(long long)min_file_size);
 #endif
                 exit(23);
         }
@@ -3749,7 +3749,7 @@ throughput_test()
 		port,kilobytes64,reclen/1024);
 #else
 	if(!silent) printf("\tEach %s writes a %lld kByte file in %lld kByte records\n",
-		port,kilobytes64,reclen/1024);
+		port,(long long)kilobytes64,reclen/1024);
 #endif
 	}
 
@@ -7182,8 +7182,8 @@ char sverify;
 	printf("where %8.8lx loop %ld\n",where,i);
 #else
 	printf("Error in file: Found ?%llx? Expecting ?%llx? addr %lx\n",*where, (long long)((pattern_buf<<32)|pattern_buf),((long)where));
-	printf("Error in file: Position %lld \n",file_position);
-	printf("Record # %lld Record size %lld kb \n",recnum,recsize/1024);
+	printf("Error in file: Position %lld \n",(long long)file_position);
+	printf("Record # %lld Record size %lld kb \n",(long long)recnum,recsize/1024);
 	printf("where %px loop %lld\n",where,(long long)i);
 #endif
 		   return(1);

Return to bug 211152

Line 0 Link Here

(-)files/patch-iozone_2.c (+103 lines)
		1	--- iozone.c.orig 2016-07-16 17:05:13 UTC
		2	+++ iozone.c
		3	@@ -1916,7 +1916,7 @@ char **argv;
		4	break;
		5	case 's': /* Set file size */
		6	#ifdef NO_PRINT_LLD
		7	- sscanf(optarg,"%ld",&kilobytes64);
		8	+ sscanf(optarg,"%ld",(long long *)&kilobytes64);
		9	#else
		10	sscanf(optarg,"%lld",&kilobytes64);
		11	#endif
		12	@@ -1940,7 +1940,7 @@ char **argv;
		13	min_file_size = (off64_t)s_range[0]; /* Make visable globally */
		14
		15	#ifdef NO_PRINT_LLD
		16	- sprintf(splash[splash_line++],"\tFile size set to %ld kB\n",kilobytes64);
		17	+ sprintf(splash[splash_line++],"\tFile size set to %ld kB\n",(long long )kilobytes64);
		18	#else
		19	sprintf(splash[splash_line++],"\tFile size set to %lld kB\n",kilobytes64);
		20	#endif
		21	@@ -2314,7 +2314,7 @@ char **argv;
		22	if(minimum_file_size < page_size/1024)
		23	minimum_file_size=(off64_t)(page_size/1024);
		24	#ifdef NO_PRINT_LLD
		25	- sprintf(splash[splash_line++],"\tUsing minimum file size of %ld kilobytes.\n",minimum_file_size);
		26	+ sprintf(splash[splash_line++],"\tUsing minimum file size of %ld (long long)kilobytes.\n",minimum_file_size);
		27	#else
		28	sprintf(splash[splash_line++],"\tUsing minimum file size of %lld kilobytes.\n",minimum_file_size);
		29	#endif
		30	@@ -2337,7 +2337,7 @@ char **argv;
		31	if(maximum_file_size < RECLEN_START/1024)
		32	maximum_file_size=(off64_t)(RECLEN_START/1024);
		33	#ifdef NO_PRINT_LLD
		34	- sprintf(splash[splash_line++],"\tUsing maximum file size of %ld kilobytes.\n",maximum_file_size);
		35	+ sprintf(splash[splash_line++],"\tUsing maximum file size of %ld (long long)kilobytes.\n",maximum_file_size);
		36	#else
		37	sprintf(splash[splash_line++],"\tUsing maximum file size of %lld kilobytes.\n",maximum_file_size);
		38	#endif
		39	@@ -2447,7 +2447,7 @@ char **argv;
		40	#ifdef NO_PRINT_LLD
		41	sscanf(subarg,"%ld",&burst_size_kb_64);
		42	#else
		43	- sscanf(subarg,"%lld",&burst_size_kb_64);
		44	+ sscanf(subarg,"%lld",(long long *)&burst_size_kb_64);
		45	#endif
		46	if(subarg[strlen(subarg)-1]=='k' \|\|
		47	subarg[strlen(subarg)-1]=='K'){
		48	@@ -3109,7 +3109,7 @@ char **argv;
		49	burst_size_kb_64, burst_sleep_duration_msec);
		50	#else
		51	printf("\tBurst size set to %lld Kbytes.\n\tBurst sleep duration set to %lld msec\n",
		52	- burst_size_kb_64, burst_sleep_duration_msec);
		53	+ (long long)burst_size_kb_64, burst_sleep_duration_msec);
		54	#endif
		55	if(!rflag)
		56	reclen=(long long)4096;
		57	@@ -3345,7 +3345,7 @@ long long reclength;
		58	if(!silent) printf("%8ld",reclen/1024);
		59	}
		60	#else
		61	- if(!silent) printf("%16lld",kilobytes64);
		62	+ if(!silent) printf("%16lld",(long long)kilobytes64);
		63	if(r_traj_flag \|\| w_traj_flag)
		64	{
65	if(!silent) printf("%8lld",(long long )0);
66	@@ -3403,7 +3403,7 @@ long long reclength;
67	printf("\n\tiozone %ld %ld ", kilobytes64, goodrecl);
68	printf("\t(i.e. record size = %ld bytes)\n", goodrecl);
69	#else
70	- printf("\n\tiozone %lld %lld ", kilobytes64, goodrecl);
71	+ printf("\n\tiozone %lld %lld ", (long long)kilobytes64, goodrecl);
72	printf("\t(i.e. record size = %lld bytes)\n", goodrecl);
73	#endif
74	}
75	@@ -3544,7 +3544,7 @@ void auto_test()
76	min_rec_size,min_file_size);
77	#else
78	printf("Error: record length %lld is greater than filesize %lld kB\n ",
79	- min_rec_size,min_file_size);
80	+ min_rec_size,(long long)min_file_size);
81	#endif
82	exit(23);
83	}
84	@@ -3749,7 +3749,7 @@ throughput_test()
85	port,kilobytes64,reclen/1024);
86	#else
87	if(!silent) printf("\tEach %s writes a %lld kByte file in %lld kByte records\n",
88	- port,kilobytes64,reclen/1024);
89	+ port,(long long)kilobytes64,reclen/1024);
90	#endif
91	}
92
93	@@ -7182,8 +7182,8 @@ char sverify;
94	printf("where %8.8lx loop %ld\n",where,i);
95	#else
96	printf("Error in file: Found ?%llx? Expecting ?%llx? addr %lx\n",*where, (long long)((pattern_buf<<32)\|pattern_buf),((long)where));
97	- printf("Error in file: Position %lld \n",file_position);
98	- printf("Record # %lld Record size %lld kb \n",recnum,recsize/1024);
99	+ printf("Error in file: Position %lld \n",(long long)file_position);
100	+ printf("Record # %lld Record size %lld kb \n",(long long)recnum,recsize/1024);
101	printf("where %px loop %lld\n",where,(long long)i);
102	#endif
103	return(1);