From d772111b9131a9fc7ad4da1008ba6fb202344a2f Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 2 Jan 2008 13:22:26 +0200
Subject: [PATCH] Use size_t, not int for header format padding args

---
 lib/formats.c  | 16 ++++++++--------
 rpmdb/header.c | 14 +++++++-------
 rpmdb/header.h |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/formats.c b/lib/formats.c
index f41eb7e..90ea4d3 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -25,7 +25,7 @@
  * @return		formatted string
  */
 static char * triggertypeFormat(rpm_tagtype_t type, rpm_constdata_t data, 
-		char * formatPrefix, int padding,
+		char * formatPrefix, size_t padding,
 		int element)
 {
     const int32_t * item = data;
@@ -56,7 +56,7 @@ static char * triggertypeFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @return		formatted string
  */
 static char * permsFormat(rpm_tagtype_t type, rpm_constdata_t data,
-		char * formatPrefix, int padding, int element)
+		char * formatPrefix, size_t padding, int element)
 {
     char * val;
     char * buf;
@@ -84,7 +84,7 @@ static char * permsFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @return		formatted string
  */
 static char * fflagsFormat(rpm_tagtype_t type, rpm_constdata_t data, 
-		char * formatPrefix, int padding, int element)
+		char * formatPrefix, size_t padding, int element)
 {
     char * val;
     char buf[15];
@@ -130,7 +130,7 @@ static char * fflagsFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @return		formatted string
  */
 static char * armorFormat(rpm_tagtype_t type, rpm_constdata_t data, 
-		char * formatPrefix, int padding,
+		char * formatPrefix, size_t padding,
 		int element)
 {
     const char * enc;
@@ -180,7 +180,7 @@ static char * armorFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @return		formatted string
  */
 static char * base64Format(rpm_tagtype_t type, rpm_constdata_t data, 
-		char * formatPrefix, int padding, int element)
+		char * formatPrefix, size_t padding, int element)
 {
     char * val;
 
@@ -256,7 +256,7 @@ static char * xmlstrcpy(char * t, const char * s)
  * @return		formatted string
  */
 static char * xmlFormat(rpm_tagtype_t type, rpm_constdata_t data, 
-		char * formatPrefix, int padding,
+		char * formatPrefix, size_t padding,
 		int element)
 {
     const char * xtag = NULL;
@@ -347,7 +347,7 @@ static char * xmlFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @return		formatted string
  */
 static char * pgpsigFormat(rpm_tagtype_t type, rpm_constdata_t data, 
-		char * formatPrefix, int padding,
+		char * formatPrefix, size_t padding,
 		int element)
 {
     char * val, * t;
@@ -454,7 +454,7 @@ static char * pgpsigFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @return		formatted string
  */
 static char * depflagsFormat(rpm_tagtype_t type, rpm_constdata_t data, 
-		char * formatPrefix, int padding, int element)
+		char * formatPrefix, size_t padding, int element)
 {
     char * val;
     char buf[10];
diff --git a/rpmdb/header.c b/rpmdb/header.c
index 0dc8309..17b8101 100644
--- a/rpmdb/header.c
+++ b/rpmdb/header.c
@@ -3048,7 +3048,7 @@ char * _headerSprintf(Header h, const char * fmt,
     sprintfTag tag;
     char * t, * te;
     int isxml;
-    int need;
+    size_t need;
  
     hsa->h = _headerLink(h);
     hsa->fmt = xstrdup(fmt);
@@ -3118,7 +3118,7 @@ exit:
  * @return		formatted string
  */
 static char * octalFormat(rpm_tagtype_t type, rpm_constdata_t data, 
-		char * formatPrefix, int padding,int element)
+		char * formatPrefix, size_t padding,int element)
 {
     char * val;
 
@@ -3143,7 +3143,7 @@ static char * octalFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @return		formatted string
  */
 static char * hexFormat(rpm_tagtype_t type, rpm_constdata_t data, 
-		char * formatPrefix, int padding,int element)
+		char * formatPrefix, size_t padding,int element)
 {
     char * val;
 
@@ -3161,7 +3161,7 @@ static char * hexFormat(rpm_tagtype_t type, rpm_constdata_t data,
 /**
  */
 static char * realDateFormat(rpm_tagtype_t type, rpm_constdata_t data, 
-		char * formatPrefix, int padding,int element,
+		char * formatPrefix, size_t padding,int element,
 		const char * strftimeFormat)
 {
     char * val;
@@ -3198,7 +3198,7 @@ static char * realDateFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @return		formatted string
  */
 static char * dateFormat(rpm_tagtype_t type, rpm_constdata_t data, 
-		         char * formatPrefix, int padding, int element)
+		         char * formatPrefix, size_t padding, int element)
 {
     return realDateFormat(type, data, formatPrefix, padding, element,
 			_("%c"));
@@ -3214,7 +3214,7 @@ static char * dateFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @return		formatted string
  */
 static char * dayFormat(rpm_tagtype_t type, rpm_constdata_t data, 
-		         char * formatPrefix, int padding, int element)
+		         char * formatPrefix, size_t padding, int element)
 {
     return realDateFormat(type, data, formatPrefix, padding, element, 
 			  _("%a %b %d %Y"));
@@ -3230,7 +3230,7 @@ static char * dayFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @return		formatted string
  */
 static char * shescapeFormat(rpm_tagtype_t type, rpm_constdata_t data, 
-		char * formatPrefix, int padding,int element)
+		char * formatPrefix, size_t padding,int element)
 {
     char * result, * dst, * src, * buf;
 
diff --git a/rpmdb/header.h b/rpmdb/header.h
index e436152..b652d2c 100644
--- a/rpmdb/header.h
+++ b/rpmdb/header.h
@@ -145,7 +145,7 @@ enum headerSprintfExtensionType {
  */
 typedef char * (*headerTagFormatFunction)(rpm_tagtype_t type,
 				rpm_constdata_t data, char * formatPrefix,
-				int padding, rpm_count_t element);
+				size_t padding, rpm_count_t element);
 
 /** \ingroup header
  * HEADER_EXT_FORMAT format function prototype.
-- 
2.7.4