From b34683e78a0879dbc3b46031c494fbfa469836e0 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Mon, 18 Mar 2002 16:01:33 +0000 Subject: [PATCH] Don't test for string::c_str() returning NULL. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3767 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/controllers/ChangeLog | 5 +++++ src/frontends/controllers/biblio.C | 12 +++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index eacb46db7a..f143da3ac5 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,8 @@ +2002-03-18 Angus Leeming + + * biblio.C (getInfo): string::c_str() never returns NULL. Don't test + for it. + 2002-03-11 Herbert Voss * biblio.C (parseBibTeX): fix another minibug with an diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C index 9082739e4f..f294e51740 100644 --- a/src/frontends/controllers/biblio.C +++ b/src/frontends/controllers/biblio.C @@ -294,14 +294,12 @@ string const getInfo(InfoMap const & map, string const & key) if (!year.empty()) result << ", " << year; - char const * const tmp = result.str().c_str(); - string result_str = tmp ? strip(tmp) : string(); + string const result_str = strip(result.str().c_str()); + if (!result_str.empty()) + return result_str; - if (result_str.empty()) - // This should never happen (or at least be very unusual!) - result_str = it->second; - - return result_str; + // This should never happen (or at least be very unusual!) + return it->second; } -- 2.39.2