diff options
-rw-r--r-- | lib/misc.c | 13 | ||||
-rw-r--r-- | lib/package.c | 2 | ||||
-rw-r--r-- | lib/query.c | 3 | ||||
-rw-r--r-- | po/cs.po | 2 | ||||
-rw-r--r-- | po/da.po | 2 | ||||
-rw-r--r-- | po/de.po | 2 | ||||
-rw-r--r-- | po/fi.po | 2 | ||||
-rw-r--r-- | po/fr.po | 2 | ||||
-rw-r--r-- | po/gl.po | 2 | ||||
-rw-r--r-- | po/is.po | 2 | ||||
-rw-r--r-- | po/ja.po | 2 | ||||
-rw-r--r-- | po/ko.po | 2 | ||||
-rw-r--r-- | po/no.po | 2 | ||||
-rw-r--r-- | po/pl.po | 2 | ||||
-rw-r--r-- | po/pt.po | 2 | ||||
-rw-r--r-- | po/pt_BR.po | 2 | ||||
-rw-r--r-- | po/ro.po | 2 | ||||
-rw-r--r-- | po/rpm.pot | 2 | ||||
-rw-r--r-- | po/ru.po | 2 | ||||
-rw-r--r-- | po/sk.po | 2 | ||||
-rw-r--r-- | po/sl.po | 4 | ||||
-rw-r--r-- | po/sr.po | 2 | ||||
-rw-r--r-- | po/sv.po | 2 | ||||
-rw-r--r-- | po/tr.po | 2 | ||||
-rw-r--r-- | rpmdb/db3.c | 5 |
25 files changed, 34 insertions, 33 deletions
diff --git a/lib/misc.c b/lib/misc.c index 0288e3987..7bd6a15e2 100644 --- a/lib/misc.c +++ b/lib/misc.c @@ -224,15 +224,14 @@ errxit: char * currentDirectory(void) { - int currDirLen; - char * currDir; + int currDirLen = 0; + char * currDir = NULL; - currDirLen = 50; - currDir = xmalloc(currDirLen); - while (!getcwd(currDir, currDirLen) && errno == ERANGE) { - currDirLen += 50; + do { + currDirLen += 128; currDir = xrealloc(currDir, currDirLen); - } + memset(currDir, 0, currDirLen); + } while (getcwd(currDir, currDirLen) == NULL && errno == ERANGE); return currDir; } diff --git a/lib/package.c b/lib/package.c index c8d1f32d1..e6f9121a2 100644 --- a/lib/package.c +++ b/lib/package.c @@ -535,6 +535,7 @@ verifyinfo_exit: _("only V3 signatures can be verified, skipping V%u signature\n"), dig->signature.version); rpmtsCleanDig(ts); + sig = _free(sig); goto verifyinfo_exit; } @@ -575,6 +576,7 @@ verifyinfo_exit: _("only V3 signatures can be verified, skipping V%u signature\n"), dig->signature.version); rpmtsCleanDig(ts); + sig = _free(sig); goto verifyinfo_exit; } /*@fallthrough@*/ diff --git a/lib/query.c b/lib/query.c index 856b74ff2..d14af10a1 100644 --- a/lib/query.c +++ b/lib/query.c @@ -758,7 +758,7 @@ int rpmcliQuery(rpmts ts, QVA_t qva, const char ** argv) if (qva->qva_showPackage == NULL) qva->qva_showPackage = showQueryPackage; -fprintf(stderr, "*** BEFORE: flags %x & %x format %s\n", qva->qva_flags, _QUERY_FOR_BITS, qva->qva_queryFormat); + /* If --queryformat unspecified, then set default now. */ if (!(qva->qva_flags & _QUERY_FOR_BITS) && qva->qva_queryFormat == NULL) { qva->qva_queryFormat = rpmExpand("%{?_query_all_fmt}\n", NULL); if (!(qva->qva_queryFormat != NULL && *qva->qva_queryFormat != '\0')) { @@ -766,7 +766,6 @@ fprintf(stderr, "*** BEFORE: flags %x & %x format %s\n", qva->qva_flags, _QUERY_ qva->qva_queryFormat = xstrdup("%{name}-%{version}-%{release}\n"); } } -fprintf(stderr, "*** AFTER: flags %x & %x format %s\n", qva->qva_flags, _QUERY_FOR_BITS, qva->qva_queryFormat); vsflags = rpmExpandNumeric("%{?_vsflags_query}"); if (qva->qva_flags & VERIFY_DIGEST) @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n" "Language-Team: German <de@li.org>\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 1998-05-02 21:41:47-0400\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n" "Language-Team: Galician <trasno@ceu.fi.udc.es>\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen <ra@hp.is>\n" "Language-Team: is <kde-isl@mmedia.is>\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n" "Language-Team: JRPM <jrpm@linux.or.jp>\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n" "Language-Team: GNU Translation project <ko@li.org>\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" "Language-Team: Norwegian <no@li.org>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n" "Language-Team: pt <morais@kde.org\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 6ba060814..c5ca5d030 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton <gafton@redhat.com>\n" "Language-Team: Romanian <ro@li.org>\n" diff --git a/po/rpm.pot b/po/rpm.pot index 9403b95e5..fd9b2508d 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 2002-08-27 13:36-0400\n" "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n" "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n" "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n" @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000. -# $Id: sl.po,v 1.372 2003/01/31 22:55:54 jbj Exp $ +# $Id: sl.po,v 1.373 2003/02/03 11:47:23 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.2\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 2003-01-27 17:43+0100\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2003-01-31 17:51-0500\n" +"POT-Creation-Date: 2003-01-31 17:59-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n" "Language-Team: Turkish <tr@li.org>\n" diff --git a/rpmdb/db3.c b/rpmdb/db3.c index abe61daf5..d142ef250 100644 --- a/rpmdb/db3.c +++ b/rpmdb/db3.c @@ -241,9 +241,9 @@ static int db3_pthread_nptl(void) ret = pthread_mutex_init(&mutex, mutexattrp); if (mutexattrp != NULL) pthread_mutexattr_destroy(mutexattrp); - (void) pthread_mutex_destroy(&mutex); if (ret) return ret; + (void) pthread_mutex_destroy(&mutex); ret = pthread_condattr_init(&condattr); if (ret == 0) { @@ -256,7 +256,8 @@ static int db3_pthread_nptl(void) if (condattrp != NULL) (void)pthread_condattr_destroy(condattrp); - (void) pthread_cond_destroy(&cond); + if (ret == 0) + (void) pthread_cond_destroy(&cond); return ret; } #endif |