OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 05-Apr-2009 00:02:04 Branch: HEAD Handle: 2009040423020400 Modified files: openpkg-src/libopkele libopkele.patch Log: reduce patch Summary: Revision Changes Path 1.4 +0 -46 openpkg-src/libopkele/libopkele.patch ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/libopkele/libopkele.patch ============================================================================ $ cvs diff -u -r1.3 -r1.4 libopkele.patch --- openpkg-src/libopkele/libopkele.patch 4 Apr 2009 22:00:23 -0000 1.3 +++ openpkg-src/libopkele/libopkele.patch 4 Apr 2009 22:02:04 -0000 1.4 @@ -1,33 +1,6 @@ -Index: include/opkele/iterator.h ---- include/opkele/iterator.h.orig 2008-09-22 22:14:18 +0200 -+++ include/opkele/iterator.h 2009-04-04 23:53:20 +0200 -@@ -103,7 +103,7 @@ - ~forward_iterator_proxy() { delete I; } - - forward_iterator_proxy& operator=(const forward_iterator_proxy<T,TR,TP>& x) { -- delete I; I = x.I->dup(); return *this; } -+ delete I; I = x.I->dup(); } - - bool operator==(const forward_iterator_proxy<T,TR,TP>& x) const { - return (*I)==(*(x.I)); } Index: lib/discovery.cc --- lib/discovery.cc.orig 2008-06-29 20:45:44 +0200 +++ lib/discovery.cc 2009-04-04 23:53:20 +0200 -@@ -253,12 +253,9 @@ - util::tidy_doc_t td = util::tidy_doc_t::create(); - if(!td) - throw exception_tidy(OPKELE_CP_ "failed to create htmltidy document"); --#ifdef NDEBUG -- td.opt_set(TidyQuiet,true); -- td.opt_set(TidyShowWarnings,false); --#else /* NDEBUG */ -+#ifndef NDEBUG - td.opt_set(TidyQuiet,false); -- td.opt_set(TidyShowWarnings,true); -+ td.opt_set(TidyShowWarnings,false); - #endif /* NDEBUG */ - td.opt_set(TidyForceOutput,true); - td.opt_set(TidyXhtmlOut,true); @@ -453,25 +450,36 @@ --skipping; return; } @@ -80,22 +53,3 @@ }else if((xmode&xmode_html) && is_element(n,"head")) { skipping = -1; } -Index: lib/util.cc ---- lib/util.cc.orig 2008-09-22 22:14:18 +0200 -+++ lib/util.cc 2009-04-04 23:53:20 +0200 -@@ -210,7 +210,6 @@ - string url_decode(const string& str) { - string rv; - back_insert_iterator<string> ii(rv); -- char tmp[3]; tmp[2] = 0; - for(string::const_iterator i=str.begin(),ie=str.end(); - i!=ie;++i) { - switch(*i) { -@@ -218,6 +217,7 @@ - *(ii++) = ' '; break; - case '%': - ++i; -+ static char tmp[3] = {0,0,0}; - if(i==ie) - throw failed_conversion(OPKELE_CP_ "trailing percent in the url-encoded string"); - tmp[0] = *(i++); @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org