rpms/centericq/devel centericq-src.patch, NONE, 1.1 centericq.spec, 1.14, 1.15

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/centericq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31285

Modified Files:
	centericq.spec 
Added Files:
	centericq-src.patch 
Log Message:
- and again more size_t fixes in src


centericq-src.patch:

--- NEW FILE centericq-src.patch ---
--- src/icqdialogs.cc.orig	2005-05-29 22:41:50.000000000 +0200
+++ src/icqdialogs.cc	2005-05-29 22:45:10.000000000 +0200
@@ -894,7 +894,7 @@
     i = m.open();
     m.close();
 
-    if(i) f = (unsigned short) ((int) m.getref(i-1));
+    if(i) f = (unsigned short) ((size_t) m.getref(i-1));
 }
 
 void icqface::selectlanguage(unsigned short &f) {
@@ -946,7 +946,7 @@
     int i = m.open();
     m.close();
 
-    if(i) f = (imgender) ((int) m.getref(i-1));
+    if(i) f = (imgender) ((size_t) m.getref(i-1));
 }
 
 void icqface::selectagerange(ICQ2000::AgeRange &r) {
@@ -967,7 +967,7 @@
     int i = m.open();
     m.close();
 
-    if(i) r = (ICQ2000::AgeRange) ((int) m.getref(i-1));
+    if(i) r = (ICQ2000::AgeRange) ((size_t) m.getref(i-1));
 }
 
 bool icqface::edit(string &txt, const string &header) {
@@ -1254,7 +1254,7 @@
 
 	void *p;
 	finished = !db.open(n, b, &p);
-	i = (int) p;
+	i = (size_t) p;
 
 	if(!finished)
 	switch(b) {
@@ -1745,7 +1745,7 @@
 	    it = transfers.end();
 
 	    if(!db.gettree()->isnode(db.gettree()->getid(np-1)))
-		it = transfers.begin() + (int) db.getmenu()->getref(n-1);
+		it = transfers.begin() + (size_t) db.getmenu()->getref(n-1);
 
 	    switch(b) {
 		case 0:


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- centericq.spec	29 May 2005 07:30:04 -0000	1.14
+++ centericq.spec	29 May 2005 20:49:15 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           centericq
 Version:        4.20.0
-Release:        7
+Release:        8
 
 Summary:        Text mode menu- and window-driven IM
 
@@ -11,6 +11,7 @@
 Patch0:         centericq-libyahoo.patch
 Patch1:         centericq-kkconsui.patch
 Patch2:         centericq-kkstrtext.patch
+Patch3:         centericq-src.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  krb5-devel
@@ -29,6 +30,7 @@
 %patch0
 %patch1
 %patch2
+%patch3
 
 %build
 CFLAGS="-I/usr/include/openssl -I/usr/kerberos/include -I/usr/include ${RPM_OPT_FLAGS}" \
@@ -59,6 +61,10 @@
 
 %changelog
 * Sun May 29 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+4.20.0-8
+- and again more size_t fixes in src
+
+* Sun May 29 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 4.20.0-7
 - even more size_t build fixes in kkstrtext