rpms/alsa-lib/devel alsa-lib-getc-returns-int.patch, NONE, 1.1 alsa-lib.spec, 1.22, 1.23

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/alsa-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22029

Modified Files:
	alsa-lib.spec 
Added Files:
	alsa-lib-getc-returns-int.patch 
Log Message:
fix getc/char abuse

alsa-lib-getc-returns-int.patch:
 ainit.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE alsa-lib-getc-returns-int.patch ---
--- alsa-lib-1.0.9rc2/ainit/src/ainit.c~	2005-04-27 11:18:48.000000000 +0100
+++ alsa-lib-1.0.9rc2/ainit/src/ainit.c	2005-04-28 17:09:39.000000000 +0100
@@ -188,7 +188,7 @@ static int is_token(char *p_line, char *
 static int read_token(FILE * f_in, char *p_line, int max)
 {
   int len = 2;
-  char c;
+  int c;
 
   for (len = 2;
        (c = fgetc(f_in)) != EOF && c != SEPARATOR && len < MAX_TOKEN_LEN;
@@ -218,7 +218,7 @@ static void copy_comment(FILE * f_in, FI
 static void parse_file(CNF * p_cnf, FILE * f_in, FILE * f_out)
 {
   char line[MAX_TOKEN_LEN];
-  char c;
+  int c;
 
   while ((c = fgetc(f_in)) != EOF) {
     if (c == SEPARATOR) {


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- alsa-lib.spec	27 Apr 2005 12:41:25 -0000	1.22
+++ alsa-lib.spec	28 Apr 2005 16:23:13 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name: alsa-lib
 Version: 1.0.9rc2
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}.tar.bz2
@@ -10,6 +10,7 @@
 Patch1: alsa-lib-alpha.patch
 Patch2: alsa-lib-gcc4.patch
 Patch3: alsa-lib-ainit.patch
+Patch4: alsa-lib-getc-returns-int.patch
 URL: http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: doxygen
@@ -41,6 +42,7 @@
 %patch1 -p1 -b .alpha
 %patch2 -p1 -b .gcc4
 %patch3 -p1 -b .ainit
+%patch4 -p1 -b .getc
 
 %build
 %configure \
@@ -114,6 +116,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Thu Apr 28 2005 David Woodhouse <dwmw2 at redhat.com> 1.0.9rc2-2
+- Fix bogus use of fgetc() in ainit. (#156278)
+
 * Fri Apr 22 2005 Martin Stransky <stransky at redhat.com> 1.0.9rc2-1
 - updated to 1.0.9rc2
 - add ainit tool