From: Joerg Sonnenberger <joerg.sonnenberger@gmail.com>
Date: Thu, 25 Feb 2010 15:54:03 +0000 (-0500)
Subject: Support z for (s)size_t.
X-Git-Tag: v3.0.0a~1186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdaedd75bd7ad7b9f51e4a89a39c241004b6dfac;p=thirdparty%2Flibarchive.git

Support z for (s)size_t.

SVN-Revision: 1986
---

diff --git a/libarchive/archive_string_sprintf.c b/libarchive/archive_string_sprintf.c
index 6d3d8edde..5fa615208 100644
--- a/libarchive/archive_string_sprintf.c
+++ b/libarchive/archive_string_sprintf.c
@@ -112,11 +112,9 @@ __archive_string_vsprintf(struct archive_string *as, const char *fmt,
 		long_flag = '\0';
 		switch(*p) {
 		case 'j':
-			long_flag = 'j';
-			p++;
-			break;
 		case 'l':
-			long_flag = 'l';
+		case 'z':
+			long_flag = *p;
 			p++;
 			break;
 		}
@@ -133,6 +131,7 @@ __archive_string_vsprintf(struct archive_string *as, const char *fmt,
 			switch(long_flag) {
 			case 'j': s = va_arg(ap, intmax_t); break;
 			case 'l': s = va_arg(ap, long); break;
+			case 'z': s = va_arg(ap, ssize_t); break;
 			default:  s = va_arg(ap, int); break;
 			}
 		        append_int(as, s, 10);
@@ -146,6 +145,7 @@ __archive_string_vsprintf(struct archive_string *as, const char *fmt,
 			switch(long_flag) {
 			case 'j': u = va_arg(ap, uintmax_t); break;
 			case 'l': u = va_arg(ap, unsigned long); break;
+			case 'z': u = va_arg(ap, size_t); break;
 			default:  u = va_arg(ap, unsigned int); break;
 			}
 			/* Format it in the correct base. */