[netfilter-cvslog] r4046 - trunk/patch-o-matic-ng/patchlets/account/linux/net/ipv4/netfilter

laforge at netfilter.org laforge at netfilter.org
Mon Jun 27 16:24:53 CEST 2005


Author: laforge at netfilter.org
Date: 2005-06-27 16:24:53 +0200 (Mon, 27 Jun 2005)
New Revision: 4046

Modified:
   trunk/patch-o-matic-ng/patchlets/account/linux/net/ipv4/netfilter/ipt_account.c
Log:
use correct format string modifiers to avoid compiler warnings


Modified: trunk/patch-o-matic-ng/patchlets/account/linux/net/ipv4/netfilter/ipt_account.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/account/linux/net/ipv4/netfilter/ipt_account.c	2005-06-27 14:22:54 UTC (rev 4045)
+++ trunk/patch-o-matic-ng/patchlets/account/linux/net/ipv4/netfilter/ipt_account.c	2005-06-27 14:24:53 UTC (rev 4046)
@@ -221,7 +221,7 @@
 	
 	
 	dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() entered.\n");
-	dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() ulength = %i.\n", ulength);
+	dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() ulength = %zi.\n", ulength);
 	
 	length = ulength;
 	if (ulength > 1024)
@@ -252,22 +252,22 @@
 		dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got \"ip\".\n");
 		bufferptr += 2;
 		if (!isspace(*bufferptr)) {
-			dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%i).\n", bufferptr - buffer);
+			dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%ti).\n", bufferptr - buffer);
 			return length; /* expected space */
 		}
 		bufferptr += 1;
 		if (*bufferptr != '=') {
-			dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected equal (%i).\n", bufferptr - buffer);
+			dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected equal (%ti).\n", bufferptr - buffer);
 			return length; /* expected equal */
 		}
 		bufferptr += 1;
 		if (!isspace(*bufferptr)) {
-			dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%i).\n", bufferptr - buffer);
+			dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%ti).\n", bufferptr - buffer);
 			return length; /* expected space */
 		}
 		bufferptr += 1;
 		if (!(len = atoip(bufferptr, &ip))) {
-			dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected ip (%i).\n", bufferptr - buffer);
+			dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected ip (%ti).\n", bufferptr - buffer);
 			return length; /* expected ip */
 		}
 		bufferptr += len;
@@ -279,75 +279,75 @@
 			memset(&l, 0, sizeof(struct t_ipt_account_ip_list));
 			while(*bufferptr) {
 				if (!isspace(*bufferptr)) {
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%ti).\n", bufferptr - buffer);
 					return length; /* expected space */
 				}
 				bufferptr += 1;
 				if (!memcmp(bufferptr, "bytes_src", 9)) {
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got bytes_src (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got bytes_src (%ti).\n", bufferptr - buffer);
 					p = &l.src.b_all;
 					bufferptr += 9;
 				} else if (!memcmp(bufferptr, "bytes_dest", 10)) {					
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got bytes_dest (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got bytes_dest (%ti).\n", bufferptr - buffer);
 					p = &l.dest.b_all;
 					bufferptr += 10;
 				} else if (!memcmp(bufferptr, "packets_src", 11)) {
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got packets_src (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got packets_src (%ti).\n", bufferptr - buffer);
 					p = &l.src.p_all;
 					bufferptr += 11;
 				} else if (!memcmp(bufferptr, "packets_dest", 12)) {
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got packets_dest (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got packets_dest (%ti).\n", bufferptr - buffer);
 					p = &l.dest.p_all;
 					bufferptr += 12;
 				} else if (!memcmp(bufferptr, "time", 4)) {
 					/* time hack, ignore time tokens */
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got time (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got time (%ti).\n", bufferptr - buffer);
 					bufferptr += 4;
 					if (!isspace(*bufferptr)) {
-						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%i).\n", bufferptr - buffer);
+						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%ti).\n", bufferptr - buffer);
 						return length; /* expected space */
 					}
 					bufferptr += 1;
 					if (*bufferptr != '=') {
-						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected equal (%i).\n", bufferptr - buffer);
+						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected equal (%ti).\n", bufferptr - buffer);
 						return length; /* expected equal */
 					}
 					bufferptr += 1;
 					if (!isspace(*bufferptr)) {
-						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%i).\n", bufferptr - buffer);
+						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%ti).\n", bufferptr - buffer);
 						return length; /* expected space */
 					}
 					bufferptr += 1;
 					if (!(len = atoi64(bufferptr, &dummy))) {
-						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected int64 (%i).\n", bufferptr - buffer);
+						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected int64 (%ti).\n", bufferptr - buffer);
 						return length; /* expected int64 */
 					}
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got %llu (%i).\n", dummy, bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got %llu (%ti).\n", dummy, bufferptr - buffer);
 					bufferptr += len;
 					continue; /* skip time token */
 				} else
 					return length;	/* expected token */
 				if (!isspace(*bufferptr)) {
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%ti).\n", bufferptr - buffer);
 					return length; /* expected space */
 				}
 				bufferptr += 1;
 				if (*bufferptr != '=') {
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected equal (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected equal (%ti).\n", bufferptr - buffer);
 					return length; /* expected equal */
 				}
 				bufferptr += 1;
 				for (i = 0; i < 5; i++) {
 					if (!isspace(*bufferptr)) {
-						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%i).\n", bufferptr - buffer);
+						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%ti).\n", bufferptr - buffer);
 						return length; /* expected space */
 					}
 					bufferptr += 1;
 					if (!(len = atoi64(bufferptr, p))) {
-						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected int64 (%i).\n", bufferptr - buffer);
+						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected int64 (%ti).\n", bufferptr - buffer);
 						return length; /* expected int64 */
 					}
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got %llu (%i).\n", *p, bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got %llu (%ti).\n", *p, bufferptr - buffer);
 					bufferptr += len;
 					p++;
 				}
@@ -361,76 +361,76 @@
 			memset(&s, 0, sizeof(struct t_ipt_account_ip_list_short));
 			while(*bufferptr) {
 				if (!isspace(*bufferptr)) {
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%ti).\n", bufferptr - buffer);
 					return length; /* expected space */
 				}
 				bufferptr += 1;
 				if (!memcmp(bufferptr, "bytes_src", 9)) {
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got bytes_src (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got bytes_src (%ti).\n", bufferptr - buffer);
 					p = &s.src.b_all;
 					bufferptr += 9;
 				} else if (!memcmp(bufferptr, "bytes_dest", 10)) {					
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got bytes_dest (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got bytes_dest (%ti).\n", bufferptr - buffer);
 					p = &s.dest.b_all;
 					bufferptr += 10;
 				} else if (!memcmp(bufferptr, "packets_src", 11)) {
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got packets_src (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got packets_src (%ti).\n", bufferptr - buffer);
 					p = &s.src.p_all;
 					bufferptr += 11;
 				} else if (!memcmp(bufferptr, "packets_dest", 12)) {
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got packets_dest (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got packets_dest (%ti).\n", bufferptr - buffer);
 					p = &s.dest.p_all;
 					bufferptr += 12;
 				} else if (!memcmp(bufferptr, "time", 4)) {
 					/* time hack, ignore time tokens */
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got time (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got time (%ti).\n", bufferptr - buffer);
 					bufferptr += 4;
 					if (!isspace(*bufferptr)) {
-						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%i).\n", bufferptr - buffer);
+						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%ti).\n", bufferptr - buffer);
 						return length; /* expected space */
 					}
 					bufferptr += 1;
 					if (*bufferptr != '=') {
-						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected equal (%i).\n", bufferptr - buffer);
+						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected equal (%ti).\n", bufferptr - buffer);
 						return length; /* expected equal */
 					}
 					bufferptr += 1;
 					if (!isspace(*bufferptr)) {
-						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%i).\n", bufferptr - buffer);
+						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%ti).\n", bufferptr - buffer);
 						return length; /* expected space */
 					}
 					bufferptr += 1;
 					if (!(len = atoi64(bufferptr, &dummy))) {
-						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected int64 (%i).\n", bufferptr - buffer);
+						dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected int64 (%ti).\n", bufferptr - buffer);
 						return length; /* expected int64 */
 					}
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got %llu (%i).\n", dummy, bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got %llu (%ti).\n", dummy, bufferptr - buffer);
 					bufferptr += len;
 					continue; /* skip time token */
 				} else {
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected token (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected token (%ti).\n", bufferptr - buffer);
 					return length;	/* expected token */
 				}
 				if (!isspace(*bufferptr)) {
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%ti).\n", bufferptr - buffer);
 					return length; /* expected space */
 				}
 				bufferptr += 1;
 				if (*bufferptr != '=') {
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected equal (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected equal (%ti).\n", bufferptr - buffer);
 					return length; /* expected equal */
 				}
 				bufferptr += 1;
 				if (!isspace(*bufferptr)) {
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected space (%ti).\n", bufferptr - buffer);
 					return length; /* expected space */
 				}
 				bufferptr += 1;
 				if (!(len = atoi64(bufferptr, p))) {
-					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected int64 (%i).\n", bufferptr - buffer);
+					dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() expected int64 (%ti).\n", bufferptr - buffer);
 					return length; /* expected int64 */
 				}
-				dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got %llu (%i).\n", *p, bufferptr - buffer);
+				dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() got %llu (%ti).\n", *p, bufferptr - buffer);
 				bufferptr += len;
 			}
 			dprintk(KERN_INFO IPT_ACCOUNT_NAME ": account_seq_write() updating row.\n");
@@ -703,10 +703,10 @@
 	}
 
 	/* table doesn't exist - create new */
-	dprintk(KERN_INFO IPT_ACCOUNT_NAME ": checkentry() allocating %u for new table %s.\n", sizeof(struct t_ipt_account_table), info->name);
+	dprintk(KERN_INFO IPT_ACCOUNT_NAME ": checkentry() allocating %zu for new table %s.\n", sizeof(struct t_ipt_account_table), info->name);
         table = vmalloc(sizeof(struct t_ipt_account_table));
 	if (table == NULL) {
-		printk(KERN_INFO IPT_ACCOUNT_NAME ": checkentry() failed to allocate %u for new table %s.\n", sizeof(struct t_ipt_account_table), info->name);
+		printk(KERN_INFO IPT_ACCOUNT_NAME ": checkentry() failed to allocate %zu for new table %s.\n", sizeof(struct t_ipt_account_table), info->name);
 		ret = 0; /* was -ENOMEM */
 		goto failure;
 	}
@@ -724,19 +724,19 @@
 	
 	/* allocate memory for table->ip_list */
 	if (!table->shortlisting) {
-		dprintk(KERN_INFO IPT_ACCOUNT_NAME ": checkentry() allocating %u for ip_list.\n", sizeof(struct t_ipt_account_ip_list) * table->count);
+		dprintk(KERN_INFO IPT_ACCOUNT_NAME ": checkentry() allocating %zu for ip_list.\n", sizeof(struct t_ipt_account_ip_list) * table->count);
 		table->ip_list.l = vmalloc(sizeof(struct t_ipt_account_ip_list) * table->count);
 		if (table->ip_list.l == NULL) {
-			dprintk(KERN_INFO IPT_ACCOUNT_NAME ": checkentry() failed to allocate %u for ip_list.\n", sizeof(struct t_ipt_account_ip_list) * table->count);
+			dprintk(KERN_INFO IPT_ACCOUNT_NAME ": checkentry() failed to allocate %zu for ip_list.\n", sizeof(struct t_ipt_account_ip_list) * table->count);
 			ret = 0; /* was -ENOMEM */
 			goto failure_table;
 		}
 		memset(table->ip_list.l, 0, sizeof(struct t_ipt_account_ip_list) * table->count);
 	} else {
-		dprintk(KERN_INFO IPT_ACCOUNT_NAME ": checkentry() allocating %u for ip_list.\n", sizeof(struct t_ipt_account_ip_list_short) * table->count);
+		dprintk(KERN_INFO IPT_ACCOUNT_NAME ": checkentry() allocating %zu for ip_list.\n", sizeof(struct t_ipt_account_ip_list_short) * table->count);
 		table->ip_list.s = vmalloc(sizeof(struct t_ipt_account_ip_list_short) * table->count);
 		if (table->ip_list.s == NULL) {
-			dprintk(KERN_INFO IPT_ACCOUNT_NAME ": checkentry() failed to allocate %u for ip_list.\n", sizeof(struct t_ipt_account_ip_list_short) * table->count);
+			dprintk(KERN_INFO IPT_ACCOUNT_NAME ": checkentry() failed to allocate %zu for ip_list.\n", sizeof(struct t_ipt_account_ip_list_short) * table->count);
 			ret = 0; /* was -ENOMEM */
 			goto failure_table;
 		}




More information about the netfilter-cvslog mailing list