ref: refs/heads/SuSE-Code-11-Branch commit 99cd59532403b05ce1c3b63a911a829f92c001fe Author: Michael Andres Date: Tue Jun 2 12:36:44 2009 +0200 Fix to compile with -Werror=format-security --- CMakeLists.txt | 4 ++-- zypp/solver/detail/SATResolver.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e3c1f0..7a411aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,8 @@ MATH( EXPR LIBZYPP_AGE "${LIBZYPP_MINOR} - ${LIBZYPP_COMPATMINOR}" ) MATH( EXPR LIBZYPP_SO_FIRST "${LIBZYPP_CURRENT}-${LIBZYPP_AGE}" ) SET( VERSION "${LIBZYPP_MAJOR}.${LIBZYPP_MINOR}.${LIBZYPP_PATCH}" ) -SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g -Wall -Woverloaded-virtual -Wnon-virtual-dtor -Wl,-as-needed" ) -SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -g -Wall -Wl,-as-needed" ) +SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g -Wall -Werror=format-security -Woverloaded-virtual -Wnon-virtual-dtor -Wl,-as-needed" ) +SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -g -Wall -Werror=format-security -Wl,-as-needed" ) set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3" ) set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3" ) diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc index a3dd941..f0e9982 100644 --- a/zypp/solver/detail/SATResolver.cc +++ b/zypp/solver/detail/SATResolver.cc @@ -934,10 +934,10 @@ string SATResolver::SATprobleminfoString(Id problem, string &detail, Id &ignoreI ret = str::form (_("problem with installed package %s"), solvable2str(pool, s.get())); break; case SOLVER_PROBLEM_JOB_RULE: - ret = str::form (_("conflicting requests")); + ret = _("conflicting requests"); break; case SOLVER_PROBLEM_RPM_RULE: - ret = str::form (_("some dependency problem")); + ret = _("some dependency problem"); break; case SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP: ret = str::form (_("nothing provides requested %s"), dep2str(pool, dep)); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org