RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 06-Aug-2009 02:44:05 Branch: rpm-5_2 Handle: 2009080600440500 Modified files: (Branch: rpm-5_2) rpm/lib rpm46compat.h rpm4compat.h Log: move headerFormat() to rpm 4.6 wrapper api where it belongs Summary: Revision Changes Path 1.1.2.4 +5 -1 rpm/lib/rpm46compat.h 2.23.2.4 +1 -5 rpm/lib/rpm4compat.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/lib/rpm46compat.h ============================================================================ $ cvs diff -u -r1.1.2.3 -r1.1.2.4 rpm46compat.h --- rpm/lib/rpm46compat.h 4 Aug 2009 16:22:35 -0000 1.1.2.3 +++ rpm/lib/rpm46compat.h 6 Aug 2009 00:44:05 -0000 1.1.2.4 @@ -1,7 +1,7 @@ /* * Copyright © 2009 Per Ãyvind Karlsen <[email protected]> * - * $Id: rpm46compat.h,v 1.1.2.3 2009/08/04 16:22:35 pkarlsen Exp $ + * $Id: rpm46compat.h,v 1.1.2.4 2009/08/06 00:44:05 pkarlsen Exp $ */ #ifndef H_RPM46COMPAT @@ -197,6 +197,10 @@ return td->type; } +static inline char * headerFormat(Header h, const char * fmt, errmsg_t * errmsg) { + return headerSprintf(h, fmt, NULL, NULL, errmsg); +} + static inline int headerGet_RPMorg(Header h, rpmTag tag, rpmtd td, headerGetFlags flags) { int rc; @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpm4compat.h ============================================================================ $ cvs diff -u -r2.23.2.3 -r2.23.2.4 rpm4compat.h --- rpm/lib/rpm4compat.h 25 Jul 2009 23:51:09 -0000 2.23.2.3 +++ rpm/lib/rpm4compat.h 6 Aug 2009 00:44:05 -0000 2.23.2.4 @@ -1,7 +1,7 @@ /* * Copyright © 2008 Per Ãyvind Karlsen <[email protected]> * - * $Id: rpm4compat.h,v 2.23.2.3 2009/07/25 23:51:09 pkarlsen Exp $ + * $Id: rpm4compat.h,v 2.23.2.4 2009/08/06 00:44:05 pkarlsen Exp $ */ #ifndef H_RPM4COMPAT @@ -329,10 +329,6 @@ return h; } -static inline char * headerFormat(Header h, const char * fmt, errmsg_t * errmsg) { - return headerSprintf(h, fmt, NULL, NULL, errmsg); -} - static inline int rpmMachineScore(__attribute__((unused)) int type, const char * name) { char * platform = rpmExpand(name, "-%{_target_vendor}-%{_target_os}%{?_gnu}", NULL); int score = rpmPlatformScore(platform, NULL, 0); @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
