From 3b6005fbd9eb3d071674343db8defe3c3aabc74a Mon Sep 17 00:00:00 2001 From: jbj Date: Mon, 3 Feb 2003 11:46:52 +0000 Subject: [PATCH] oops, get rid of debugging printf's. destroy nptl functional test mutex/cond iff successful. initialize getcwd buffer to zero to keep valgrind happy. CVS patchset: 6035 CVS date: 2003/02/03 11:46:52 --- lib/misc.c | 13 ++++++------- lib/package.c | 2 ++ lib/query.c | 3 +-- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/is.po | 2 +- po/ja.po | 2 +- po/ko.po | 2 +- po/no.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/rpm.pot | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sl.po | 4 ++-- po/sr.po | 2 +- po/sv.po | 2 +- po/tr.po | 2 +- rpmdb/db3.c | 5 +++-- 25 files changed, 34 insertions(+), 33 deletions(-) diff --git a/lib/misc.c b/lib/misc.c index 0288e39..7bd6a15 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 c8d1f32..e6f9121 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 856b74f..d14af10 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) diff --git a/po/cs.po b/po/cs.po index bcb3719..dd60754 100644 --- a/po/cs.po +++ b/po/cs.po @@ -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 \n" "Language-Team: Czech \n" diff --git a/po/da.po b/po/da.po index 0930238..7ea1389 100644 --- a/po/da.po +++ b/po/da.po @@ -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 \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index 778e236..9dc0cf7 100644 --- a/po/de.po +++ b/po/de.po @@ -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 \n" "Language-Team: German \n" diff --git a/po/fi.po b/po/fi.po index ec36de1..6d44f69 100644 --- a/po/fi.po +++ b/po/fi.po @@ -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 \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index 1b18a21..2355cd3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -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 \n" "Language-Team: LANGUAGE \n" diff --git a/po/gl.po b/po/gl.po index 0813250..5574a5c 100644 --- a/po/gl.po +++ b/po/gl.po @@ -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 \n" "Language-Team: Galician \n" diff --git a/po/is.po b/po/is.po index 09a921c..416454c 100644 --- a/po/is.po +++ b/po/is.po @@ -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 \n" "Language-Team: is \n" diff --git a/po/ja.po b/po/ja.po index 690daf4..8e20049 100644 --- a/po/ja.po +++ b/po/ja.po @@ -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 \n" "Language-Team: JRPM \n" diff --git a/po/ko.po b/po/ko.po index 807098c..61768c2 100644 --- a/po/ko.po +++ b/po/ko.po @@ -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 \n" "Language-Team: GNU Translation project \n" diff --git a/po/no.po b/po/no.po index 56613f3..104f9fe 100644 --- a/po/no.po +++ b/po/no.po @@ -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 \n" "Language-Team: Norwegian \n" diff --git a/po/pl.po b/po/pl.po index 67464ca..526e76a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -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 \n" "Language-Team: Polish \n" diff --git a/po/pt.po b/po/pt.po index 5db2c63..40445bb 100644 --- a/po/pt.po +++ b/po/pt.po @@ -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 \n" "Language-Team: pt \n" "Language-Team: Romanian \n" diff --git a/po/rpm.pot b/po/rpm.pot index 9403b95..fd9b250 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 \n" "Language-Team: LANGUAGE \n" diff --git a/po/ru.po b/po/ru.po index 60c0c8a..469b04a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -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, \n" "Language-Team: Black Cat Linux Team \n" diff --git a/po/sk.po b/po/sk.po index 840ab8e..dc0decd 100644 --- a/po/sk.po +++ b/po/sk.po @@ -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 \n" "Language-Team: Slovak \n" diff --git a/po/sl.po b/po/sl.po index 3bd1268..f898dc2 100644 --- a/po/sl.po +++ b/po/sl.po @@ -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 , 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 \n" "Language-Team: Slovenian \n" diff --git a/po/sr.po b/po/sr.po index 2cefec0..b2e3e81 100644 --- a/po/sr.po +++ b/po/sr.po @@ -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" diff --git a/po/sv.po b/po/sv.po index 371de7d..9e23519 100644 --- a/po/sv.po +++ b/po/sv.po @@ -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 \n" "Language-Team: Swedish \n" diff --git a/po/tr.po b/po/tr.po index ee37fc6..68eeac9 100644 --- a/po/tr.po +++ b/po/tr.po @@ -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 \n" "Language-Team: Turkish \n" diff --git a/rpmdb/db3.c b/rpmdb/db3.c index abe61da..d142ef2 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 -- 2.7.4