RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 20:07:31 Branch: HEAD Handle: 2009041318073001 Modified files: rpm CHANGES rpm/lib poptALL.c rpm/rpmio rpmperl.c rpmpython.c rpmruby.c Log: eliminate compile-time warnings introduced with recent embedded language support Summary: Revision Changes Path 1.2922 +1 -0 rpm/CHANGES 2.125 +0 -1 rpm/lib/poptALL.c 2.5 +5 -1 rpm/rpmio/rpmperl.c 2.7 +2 -0 rpm/rpmio/rpmpython.c 2.6 +2 -0 rpm/rpmio/rpmruby.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2921 -r1.2922 CHANGES --- rpm/CHANGES 13 Apr 2009 17:47:14 -0000 1.2921 +++ rpm/CHANGES 13 Apr 2009 18:07:30 -0000 1.2922 @@ -1,5 +1,6 @@ 5.2a3 -> 5.2a4: + - rse: eliminate compile-time warnings introduced with recent embedded language support - afb: rename --with-ruby to --with-rubyembed, to match Perl/Python. - jbj: perl: attach stdout to macro expansion buffer with IO::String. - rse: use new POPT 1.15 from devtool environment @@ . patch -p0 <<'@@ .' Index: rpm/lib/poptALL.c ============================================================================ $ cvs diff -u -r2.124 -r2.125 poptALL.c --- rpm/lib/poptALL.c 11 Apr 2009 19:33:35 -0000 2.124 +++ rpm/lib/poptALL.c 13 Apr 2009 18:07:31 -0000 2.125 @@ -222,7 +222,6 @@ iob = rpmiobAppend(rpmiobNew(strlen(arg)+1), arg, 0); } -exit: val = rpmExpand(pre, iob->b, post, NULL); iob = rpmiobFree(iob); return val; @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmperl.c ============================================================================ $ cvs diff -u -r2.4 -r2.5 rpmperl.c --- rpm/rpmio/rpmperl.c 12 Apr 2009 22:28:49 -0000 2.4 +++ rpm/rpmio/rpmperl.c 13 Apr 2009 18:07:31 -0000 2.5 @@ -77,6 +77,7 @@ "; #else #define xs_init NULL +#if defined(WITH_PERLEMBED) /*...@unchecked@*/ static const char * rpmperlInitStringIO = "\ use IO::String;\n\ @@ -85,12 +86,15 @@ "; #endif +#endif rpmperl rpmperlNew(const char * fn, int flags) { +#if defined(WITH_PERLEMBED) static char *embedding[] = { "", "-e", "0" }; - rpmperl perl = rpmperlGetPool(_rpmperlPool); int xx; +#endif + rpmperl perl = rpmperlGetPool(_rpmperlPool); if (fn) perl->fn = xstrdup(fn); @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpython.c ============================================================================ $ cvs diff -u -r2.6 -r2.7 rpmpython.c --- rpm/rpmio/rpmpython.c 13 Apr 2009 16:36:37 -0000 2.6 +++ rpm/rpmio/rpmpython.c 13 Apr 2009 18:07:31 -0000 2.7 @@ -44,6 +44,7 @@ } /*...@unchecked@*/ +#if defined(WITH_PYTHONEMBED) static const char * rpmpythonInitStringIO = "\ import rpm\n\ import sys\n\ @@ -51,6 +52,7 @@ stdout = sys.stdout\n\ sys.stdout = StringIO()\n\ "; +#endif rpmpython rpmpythonNew(const char * fn, int flags) { @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmruby.c ============================================================================ $ cvs diff -u -r2.5 -r2.6 rpmruby.c --- rpm/rpmio/rpmruby.c 13 Apr 2009 16:32:43 -0000 2.5 +++ rpm/rpmio/rpmruby.c 13 Apr 2009 18:07:31 -0000 2.6 @@ -55,10 +55,12 @@ } /*...@unchecked@*/ +#if defined(WITH_RUBYEMBED) static const char * rpmrubyInitStringIO = "\ require 'stringio'\n\ $stdout = StringIO.new($result, \"w+\")\n\ "; +#endif rpmruby rpmrubyNew(const char * fn, int flags) { @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org