Hello community, here is the log from the commit of package yast2-core for openSUSE:12.2 checked in at 2012-06-28 17:23:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/yast2-core (Old) and /work/SRC/openSUSE:12.2/.yast2-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-core", Maintainer is "mvid...@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/yast2-core/yast2-core.changes 2012-06-25 16:18:26.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.yast2-core.new/yast2-core.changes 2012-06-28 17:23:11.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 22 15:53:00 CEST 2012 - aschn...@suse.de + +- allow C++ log functions to be used in namespaces +- 2.23.4 + +------------------------------------------------------------------- @@ -5 +11,2 @@ -- added testcases, logging +- added testcases +- handling of escape sequences when quoting Old: ---- yast2-core-2.23.3.tar.bz2 New: ---- yast2-core-2.23.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-core.spec ++++++ --- /var/tmp/diff_new_pack.kFBbEc/_old 2012-06-28 17:23:11.000000000 +0200 +++ /var/tmp/diff_new_pack.kFBbEc/_new 2012-06-28 17:23:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-core -Version: 2.23.3 +Version: 2.23.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-core-2.23.3.tar.bz2 -> yast2-core-2.23.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/VERSION new/yast2-core-2.23.4/VERSION --- old/yast2-core-2.23.3/VERSION 2012-06-19 09:42:47.000000000 +0200 +++ new/yast2-core-2.23.4/VERSION 2012-06-26 14:06:59.000000000 +0200 @@ -1 +1 @@ -2.23.3 +2.23.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/agent-ini/src/IniParser.cc new/yast2-core-2.23.4/agent-ini/src/IniParser.cc --- old/yast2-core-2.23.3/agent-ini/src/IniParser.cc 2012-06-19 11:03:55.000000000 +0200 +++ new/yast2-core-2.23.4/agent-ini/src/IniParser.cc 2012-06-26 13:54:01.000000000 +0200 @@ -634,12 +634,12 @@ scanner_error ("%s: values at the top level not allowed.", key.c_str ()); else { - ini.initValue (key, shell_quoted_value ? unquote( val) : val, comment, matched_by); + ini.initValue(key, shell_quoted_value ? YaST::agent_ini::unquote(val) : val, comment, matched_by); } } else { - open_sections.front()->initValue(key, shell_quoted_value ? unquote( val) : val, comment, matched_by); + open_sections.front()->initValue(key, shell_quoted_value ? YaST::agent_ini::unquote(val) : val, comment, matched_by); } comment = ""; } @@ -809,12 +809,12 @@ scanner_error ("%s: values at the top level not allowed.", key.c_str ()); else { - ini.initValue (key, shell_quoted_value ? unquote( val) : val, comment, i); + ini.initValue(key, shell_quoted_value ? YaST::agent_ini::unquote(val) : val, comment, i); } } else { - open_sections.front()->initValue(key, shell_quoted_value ?unquote( val) : val, comment, i); + open_sections.front()->initValue(key, shell_quoted_value ? YaST::agent_ini::unquote(val) : val, comment, i); } comment = ""; } @@ -1062,7 +1062,7 @@ of << e.getComment(); if (e.getReadBy()>=0 && e.getReadBy() < (int)params.size ()) { - const string val = shell_quoted_value ? quote( e.getValue()) : e.getValue(); + const string val = shell_quoted_value ? YaST::agent_ini::quote(e.getValue()) : e.getValue(); // bnc#492859, a fixed buffer is too small asprintf (&out_buffer, params[e.getReadBy ()].line.out.c_str (), e.getName(), val.c_str()); of << indent2 << out_buffer << "\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/agent-ini/src/quotes.cc new/yast2-core-2.23.4/agent-ini/src/quotes.cc --- old/yast2-core-2.23.3/agent-ini/src/quotes.cc 2012-06-20 10:33:41.000000000 +0200 +++ new/yast2-core-2.23.4/agent-ini/src/quotes.cc 2012-06-26 13:54:01.000000000 +0200 @@ -36,6 +36,11 @@ using namespace std; +namespace YaST +{ + namespace agent_ini + { + string quote( const string & unquoted_string) { string dest = "'"; @@ -167,3 +172,7 @@ return res; } + + } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/agent-ini/src/quotes.h new/yast2-core-2.23.4/agent-ini/src/quotes.h --- old/yast2-core-2.23.3/agent-ini/src/quotes.h 2012-06-20 09:13:52.000000000 +0200 +++ new/yast2-core-2.23.4/agent-ini/src/quotes.h 2012-06-26 13:54:01.000000000 +0200 @@ -36,6 +36,11 @@ #include <string> +namespace YaST +{ + namespace agent_ini + { + /* * Enclose given string into quotes to get bash ready string. */ @@ -46,4 +51,8 @@ */ std::string unquote( const std::string & unquoted_string); + } + +} + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/base/tools/ycpc/ycpc.cc new/yast2-core-2.23.4/base/tools/ycpc/ycpc.cc --- old/yast2-core-2.23.3/base/tools/ycpc/ycpc.cc 2012-06-18 07:38:08.000000000 +0200 +++ new/yast2-core-2.23.4/base/tools/ycpc/ycpc.cc 2012-06-26 13:54:01.000000000 +0200 @@ -47,8 +47,6 @@ static char *outname = NULL; -extern ExecutionEnvironment ee; - static int quiet = 0; // no output static int verbose = 0; // much output static int no_std_path = 0; // dont use builtin pathes @@ -873,8 +871,8 @@ if (! parser->atEOF () && parser->scanner ()->yylex () != END_OF_FILE) { - ee.setFilename (parser->scanner ()->filename ()); - ee.setLinenumber (ln); + YaST::ee.setFilename(parser->scanner()->filename()); + YaST::ee.setLinenumber(ln); ycperror ("Unreachable code at the end of file"); c = NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/configure new/yast2-core-2.23.4/configure --- old/yast2-core-2.23.3/configure 2012-06-18 11:28:45.000000000 +0200 +++ new/yast2-core-2.23.4/configure 2012-06-26 14:07:59.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-core 2.23.1. +# Generated by GNU Autoconf 2.68 for yast2-core 2.23.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='yast2-core' PACKAGE_TARNAME='yast2-core' -PACKAGE_VERSION='2.23.1' -PACKAGE_STRING='yast2-core 2.23.1' +PACKAGE_VERSION='2.23.4' +PACKAGE_STRING='yast2-core 2.23.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1371,7 +1371,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-core 2.23.1 to adapt to many kinds of systems. +\`configure' configures yast2-core 2.23.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1442,7 +1442,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-core 2.23.1:";; + short | recursive ) echo "Configuration of yast2-core 2.23.4:";; esac cat <<\_ACEOF @@ -1559,7 +1559,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-core configure 2.23.1 +yast2-core configure 2.23.4 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2012,7 +2012,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-core $as_me 2.23.1, which was +It was created by yast2-core $as_me 2.23.4, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2942,7 +2942,7 @@ # Define the identity of the package. PACKAGE='yast2-core' - VERSION='2.23.1' + VERSION='2.23.4' cat >>confdefs.h <<_ACEOF @@ -3064,7 +3064,7 @@ -VERSION="2.23.1" +VERSION="2.23.4" RPMNAME="yast2-core" MAINTAINER="Martin Vidner <mvid...@suse.cz>" @@ -6698,7 +6698,7 @@ CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" -: ${AGENT_LIBADD:='-L$(libdir) -lscr'} +: ${AGENT_LIBADD:='-L$(libdir) -lscr -ly2util -lycpvalues'} # Check whether --enable-static was given. @@ -18179,7 +18179,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-core $as_me 2.23.1, which was +This file was extended by yast2-core $as_me 2.23.4, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18245,7 +18245,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-core config.status 2.23.1 +yast2-core config.status 2.23.4 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/configure.in new/yast2-core-2.23.4/configure.in --- old/yast2-core-2.23.3/configure.in 2012-06-18 11:28:36.000000000 +0200 +++ new/yast2-core-2.23.4/configure.in 2012-06-26 14:07:53.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.21.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-core, 2.23.1, http://bugs.opensuse.org/, yast2-core) +AC_INIT(yast2-core, 2.23.4, http://bugs.opensuse.org/, yast2-core) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.23.1" +VERSION="2.23.4" RPMNAME="yast2-core" MAINTAINER="Martin Vidner <mvid...@suse.cz>" @@ -222,7 +222,7 @@ CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" -: ${AGENT_LIBADD:='-L$(libdir) -lscr'} +: ${AGENT_LIBADD:='-L$(libdir) -lscr -ly2util -lycpvalues'} AC_SUBST(AGENT_LIBADD) AC_DISABLE_STATIC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/debugger/Debugger.cc new/yast2-core-2.23.4/debugger/Debugger.cc --- old/yast2-core-2.23.3/debugger/Debugger.cc 2012-06-18 07:38:08.000000000 +0200 +++ new/yast2-core-2.23.4/debugger/Debugger.cc 2012-06-26 13:54:01.000000000 +0200 @@ -41,8 +41,6 @@ #define ADDRESS "/tmp/yast.socket" #define PORT 16384 -extern ExecutionEnvironment ee; - Debugger::Debugger () : m_socket (-1), m_descriptor (NULL), @@ -235,8 +233,8 @@ void Debugger::generateBacktrace () { std::string result = "Call stack:"; - ExecutionEnvironment::CallStack stack = ee.callstack(); - ExecutionEnvironment::CallStack::const_reverse_iterator it = stack.rbegin(); + YaST::ExecutionEnvironment::CallStack stack = YaST::ee.callstack(); + YaST::ExecutionEnvironment::CallStack::const_reverse_iterator it = stack.rbegin(); while (it != stack.rend()) { result = result @@ -298,11 +296,11 @@ else { // try parameters - ExecutionEnvironment::CallStack stack = ee.callstack(); + YaST::ExecutionEnvironment::CallStack stack = YaST::ee.callstack(); if( stack.size() > 0 ) { - ExecutionEnvironment::CallStack::const_reverse_iterator it = stack.rbegin(); + YaST::ExecutionEnvironment::CallStack::const_reverse_iterator it = stack.rbegin(); YSymbolEntryPtr ysentry = (YSymbolEntryPtr)((*it)->function->entry()); @@ -396,11 +394,11 @@ return false; // First, send the current context - YStatementPtr statement = ee.statement (); + YStatementPtr statement = YaST::ee.statement(); after_internal: if (statement) - sendOutput (ee.filename() + ":" + stringutil::numstring(ee.linenumber()) + " >>> " + statement->toString ()); + sendOutput(YaST::ee.filename() + ":" + stringutil::numstring(YaST::ee.linenumber()) + " >>> " + statement->toString()); else sendOutput ("no code"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/liby2/src/Makefile.am new/yast2-core-2.23.4/liby2/src/Makefile.am --- old/yast2-core-2.23.3/liby2/src/Makefile.am 2012-06-18 14:23:16.000000000 +0200 +++ new/yast2-core-2.23.4/liby2/src/Makefile.am 2012-06-26 13:54:01.000000000 +0200 @@ -22,7 +22,7 @@ Y2PluginComponent.cc Y2CCPlugin.cc \ Y2StdioComponent.cc Y2CCStdio.cc -liby2_la_LDFLAGS = -version-info 2:0 +liby2_la_LDFLAGS = -version-info 3:0 # pthread added (74501) liby2_la_LIBADD = ${Y2UTIL_LIBS} -lutil -ldl -lpthread diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/liby2/src/Makefile.in new/yast2-core-2.23.4/liby2/src/Makefile.in --- old/yast2-core-2.23.3/liby2/src/Makefile.in 2012-06-18 14:32:29.000000000 +0200 +++ new/yast2-core-2.23.4/liby2/src/Makefile.in 2012-06-26 14:08:02.000000000 +0200 @@ -359,7 +359,7 @@ Y2PluginComponent.cc Y2CCPlugin.cc \ Y2StdioComponent.cc Y2CCStdio.cc -liby2_la_LDFLAGS = -version-info 2:0 +liby2_la_LDFLAGS = -version-info 3:0 # pthread added (74501) liby2_la_LIBADD = ${Y2UTIL_LIBS} -lutil -ldl -lpthread libpy2serial_la_SOURCES = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/liby2/src/genericfrontend.cc new/yast2-core-2.23.4/liby2/src/genericfrontend.cc --- old/yast2-core-2.23.3/liby2/src/genericfrontend.cc 2012-06-18 14:23:16.000000000 +0200 +++ new/yast2-core-2.23.4/liby2/src/genericfrontend.cc 2012-06-26 13:54:01.000000000 +0200 @@ -117,7 +117,7 @@ }; using std::string; -ExecutionEnvironment ee; + Debugger *debugger_instance; /// fallback name of the program @@ -242,7 +242,7 @@ char buffer[200]; int n = snprintf (buffer, sizeof(buffer), "YaST got signal %d at YCP file %s:%d\n", - sig, ee.filename ().c_str (), ee.linenumber ()); + sig, YaST::ee.filename().c_str(), YaST::ee.linenumber()); if (n >= (int)sizeof(buffer) || n < 0) strcpy (buffer, "YaST got a signal.\n"); signal_log_to_fd (STDERR_FILENO, buffer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/ExecutionEnvironment.cc new/yast2-core-2.23.4/libycp/src/ExecutionEnvironment.cc --- old/yast2-core-2.23.3/libycp/src/ExecutionEnvironment.cc 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/ExecutionEnvironment.cc 2012-06-26 13:54:01.000000000 +0200 @@ -18,11 +18,17 @@ #include "ycp/y2log.h" +namespace YaST +{ + // the number of call frames to show warning at #define WARN_RECURSION 1001 static const char * Y2RECURSIONLIMIT = "Y2RECURSIONLIMIT"; + ExecutionEnvironment ee; + + ExecutionEnvironment::ExecutionEnvironment () : m_filename ("") , m_forced_filename (false) @@ -52,8 +58,8 @@ } -const string -ExecutionEnvironment::filename () const +const string& +ExecutionEnvironment::filename() const { return m_filename; } @@ -148,4 +154,6 @@ return m_backtrace; } +} + /* EOF */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/Makefile.am new/yast2-core-2.23.4/libycp/src/Makefile.am --- old/yast2-core-2.23.3/libycp/src/Makefile.am 2012-06-18 14:23:16.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/Makefile.am 2012-06-26 13:54:01.000000000 +0200 @@ -64,7 +64,7 @@ -I$(top_srcdir)/debugger # CURRENT:REVISION:AGE -libycpvalues_la_LDFLAGS = -version-info 4:0:0 +libycpvalues_la_LDFLAGS = -version-info 5:0:0 libycpvalues_la_LIBADD = ${Y2UTIL_LIBS} libycp_la_LDFLAGS = -version-info 3:0:0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/Makefile.in new/yast2-core-2.23.4/libycp/src/Makefile.in --- old/yast2-core-2.23.3/libycp/src/Makefile.in 2012-06-18 14:32:27.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/Makefile.in 2012-06-26 14:08:03.000000000 +0200 @@ -438,7 +438,7 @@ # CURRENT:REVISION:AGE -libycpvalues_la_LDFLAGS = -version-info 4:0:0 +libycpvalues_la_LDFLAGS = -version-info 5:0:0 libycpvalues_la_LIBADD = ${Y2UTIL_LIBS} libycp_la_LDFLAGS = -version-info 3:0:0 libycp_la_LIBADD = ${Y2UTIL_LIBS} -lcrypt libycpvalues.la $(top_builddir)/debugger/liby2debug.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/YBlock.cc new/yast2-core-2.23.4/libycp/src/YBlock.cc --- old/yast2-core-2.23.3/libycp/src/YBlock.cc 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/YBlock.cc 2012-06-26 13:54:01.000000000 +0200 @@ -45,7 +45,6 @@ #include <Debugger.h> -extern ExecutionEnvironment ee; extern Debugger* debugger_instance; // ------------------------------------------------------------------ @@ -599,8 +598,8 @@ string restore_name; if (!filename().empty()) { - restore_name = ee.filename (); - ee.setFilename (filename()); + restore_name = YaST::ee.filename(); + YaST::ee.setFilename(filename()); } stmtlist_t *stmt = m_statements; @@ -612,7 +611,7 @@ #if DO_DEBUG y2debug ("%d: %s", statement->line (), statement->toString ().c_str ()); #endif - ee.setStatement (statement); + YaST::ee.setStatement(statement); if (m_debug && statement->kind() != ysFunction ) { @@ -655,7 +654,7 @@ } if (!restore_name.empty()) { - ee.setFilename (restore_name); + YaST::ee.setFilename(restore_name); } m_running = old_m_running; @@ -708,8 +707,8 @@ string restore_name; if (!filename().empty()) { - restore_name = ee.filename (); - ee.setFilename (filename()); + restore_name = YaST::ee.filename(); + YaST::ee.setFilename(filename()); } stmtlist_t *stmt = m_statements; @@ -731,8 +730,8 @@ y2debug ("%d: %s", statement->line (), statement->toString ().c_str ()); #endif - ee.setStatement (statement); - value = statement->evaluate (); + YaST::ee.setStatement(statement); + value = statement->evaluate(); if (!value.isNull()) { @@ -746,7 +745,7 @@ } if (!restore_name.empty()) { - ee.setFilename (restore_name); + YaST::ee.setFilename(restore_name); } m_running = old_m_running; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/YCPBuiltinBoolean.cc new/yast2-core-2.23.4/libycp/src/YCPBuiltinBoolean.cc --- old/yast2-core-2.23.3/libycp/src/YCPBuiltinBoolean.cc 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/YCPBuiltinBoolean.cc 2012-06-26 13:54:01.000000000 +0200 @@ -24,7 +24,6 @@ #include "ycp/y2log.h" #include "ycp/ExecutionEnvironment.h" -extern ExecutionEnvironment ee; extern StaticDeclaration static_declarations; @@ -64,7 +63,7 @@ if (b1_v.isNull () || b1_v->isVoid ()) { - ycp2warning (ee.filename().c_str(), ee.linenumber(), "First operand of '||' evaluates to nil, using 'false' instead."); + ycp2warning(YaST::ee.filename().c_str(), YaST::ee.linenumber(), "First operand of '||' evaluates to nil, using 'false' instead."); } else if (b1_v->asBoolean ()->value ()) { @@ -74,7 +73,7 @@ YCPValue b2_v = b2->code ()->evaluate (); if (b2_v.isNull () || b2_v->isVoid ()) { - ycp2warning (ee.filename().c_str(), ee.linenumber(), "Second operand of '||' evaluates to nil, using 'false' instead."); + ycp2warning(YaST::ee.filename().c_str(), YaST::ee.linenumber(), "Second operand of '||' evaluates to nil, using 'false' instead."); return YCPBoolean (false); } @@ -98,7 +97,7 @@ if (b1_v.isNull () || b1_v->isVoid ()) { - ycp2warning (ee.filename().c_str(), ee.linenumber(), "First operand of '&&' evaluates to nil, using 'false' instead."); + ycp2warning(YaST::ee.filename().c_str(), YaST::ee.linenumber(), "First operand of '&&' evaluates to nil, using 'false' instead."); return YCPBoolean (false); } @@ -108,7 +107,7 @@ YCPValue b2_v = b2->code ()->evaluate (); if (b2_v.isNull () || b2_v->isVoid ()) { - ycp2warning (ee.filename().c_str(), ee.linenumber(), "Second operand of '&&' evaluates to nil, using 'false' instead."); + ycp2warning(YaST::ee.filename().c_str(), YaST::ee.linenumber(), "Second operand of '&&' evaluates to nil, using 'false' instead."); return YCPBoolean (false); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/YCPBuiltinMisc.cc new/yast2-core-2.23.4/libycp/src/YCPBuiltinMisc.cc --- old/yast2-core-2.23.3/libycp/src/YCPBuiltinMisc.cc 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/YCPBuiltinMisc.cc 2012-06-26 13:54:01.000000000 +0200 @@ -358,11 +358,9 @@ return YCPNull (); } - extern ExecutionEnvironment ee; - // The "" is a function name. TODO. It will be useful but may // break ycp testsuites. Maybe it's the right time to do it. - ycp2log (level, ee.filename().c_str(), ee.linenumber(), "", "%s", arg->asString ()->value ().c_str ()); + ycp2log(level, YaST::ee.filename().c_str(), YaST::ee.linenumber(), "", "%s", arg->asString()->value().c_str()); return YCPVoid (); } @@ -505,7 +503,6 @@ // FIXME: positive: pretend one of our callers invoked the log // negative: print backtrace - extern ExecutionEnvironment ee; int frame = f->value (); @@ -513,7 +510,7 @@ if (frame < 0) { - ee.backtrace (LOG_DEBUG, 0); + YaST::ee.backtrace(LOG_DEBUG, 0); } return YCPVoid (); @@ -524,7 +521,6 @@ { // FIXME: positive: pretend one of our callers invoked the log // negative: print backtrace - extern ExecutionEnvironment ee; int frame = f->value (); @@ -532,7 +528,7 @@ if (frame < 0) { - ee.backtrace (LOG_MILESTONE, 0); + YaST::ee.backtrace(LOG_MILESTONE, 0); } return YCPVoid (); @@ -543,7 +539,6 @@ { // FIXME: positive: pretend one of our callers invoked the log // negative: print backtrace - extern ExecutionEnvironment ee; int frame = f->value (); @@ -551,7 +546,7 @@ if (frame < 0) { - ee.backtrace (LOG_WARNING, 0); + YaST::ee.backtrace(LOG_WARNING, 0); } return YCPVoid (); @@ -562,7 +557,6 @@ { // FIXME: positive: pretend one of our callers invoked the log // negative: print backtrace - extern ExecutionEnvironment ee; int frame = f->value (); @@ -570,7 +564,7 @@ if (frame < 0) { - ee.backtrace (LOG_ERROR, 0); + YaST::ee.backtrace(LOG_ERROR, 0); } return YCPVoid (); @@ -581,7 +575,6 @@ { // FIXME: positive: pretend one of our callers invoked the log // negative: print backtrace - extern ExecutionEnvironment ee; int frame = f->value (); @@ -589,7 +582,7 @@ if (frame < 0) { - ee.backtrace (LOG_SECURITY, 0); + YaST::ee.backtrace(LOG_SECURITY, 0); } return YCPVoid (); @@ -600,7 +593,6 @@ { // FIXME: positive: pretend one of our callers invoked the log // negative: print backtrace - extern ExecutionEnvironment ee; int frame = f->value (); @@ -608,7 +600,7 @@ if (frame < 0) { - ee.backtrace (LOG_INTERNAL, 0); + YaST::ee.backtrace(LOG_INTERNAL, 0); } return YCPVoid (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/YCPBuiltinString.cc new/yast2-core-2.23.4/libycp/src/YCPBuiltinString.cc --- old/yast2-core-2.23.3/libycp/src/YCPBuiltinString.cc 2012-06-18 14:23:16.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/YCPBuiltinString.cc 2012-06-26 13:54:01.000000000 +0200 @@ -1260,7 +1260,7 @@ string unencrypted = s->value(); string encrypted; - if (crypt_pass (unencrypted, CRYPT, &encrypted)) + if (YaST::crypt_pass(unencrypted, YaST::CRYPT, &encrypted)) return YCPString (encrypted); else { @@ -1291,7 +1291,7 @@ string unencrypted = s->value(); string encrypted; - if (crypt_pass (unencrypted, MD5, &encrypted)) + if (YaST::crypt_pass(unencrypted, YaST::MD5, &encrypted)) return YCPString (encrypted); else { @@ -1322,7 +1322,7 @@ string unencrypted = original->value(); string encrypted; - if (crypt_pass (unencrypted, BLOWFISH, &encrypted)) + if (YaST::crypt_pass(unencrypted, YaST::BLOWFISH, &encrypted)) return YCPString (encrypted); else { @@ -1353,7 +1353,7 @@ string unencrypted = original->value(); string encrypted; - if (crypt_pass (unencrypted, SHA256, &encrypted)) + if (YaST::crypt_pass(unencrypted, YaST::SHA256, &encrypted)) return YCPString (encrypted); else { @@ -1384,7 +1384,7 @@ string unencrypted = original->value(); string encrypted; - if (crypt_pass (unencrypted, SHA512, &encrypted)) + if (YaST::crypt_pass(unencrypted, YaST::SHA512, &encrypted)) return YCPString (encrypted); else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/YCPExternal.cc new/yast2-core-2.23.4/libycp/src/YCPExternal.cc --- old/yast2-core-2.23.3/libycp/src/YCPExternal.cc 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/YCPExternal.cc 2012-06-26 13:54:01.000000000 +0200 @@ -22,7 +22,6 @@ #include "ycp/Bytecode.h" #include "ycp/ExecutionEnvironment.h" -extern ExecutionEnvironment ee; // YCPExternalRep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/YCPInteger.cc new/yast2-core-2.23.4/libycp/src/YCPInteger.cc --- old/yast2-core-2.23.3/libycp/src/YCPInteger.cc 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/YCPInteger.cc 2012-06-26 13:54:01.000000000 +0200 @@ -23,7 +23,6 @@ #include "ycp/Bytecode.h" #include "ycp/ExecutionEnvironment.h" -extern ExecutionEnvironment ee; // YCPIntegerRep @@ -56,7 +55,7 @@ if (converted != 1) { - ycp2warning (ee.filename().c_str(), ee.linenumber(), "Cannot convert '%s' to an integer", r); + ycp2warning(YaST::ee.filename().c_str(), YaST::ee.linenumber(), "Cannot convert '%s' to an integer", r); v = 0; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/YCPList.cc new/yast2-core-2.23.4/libycp/src/YCPList.cc --- old/yast2-core-2.23.3/libycp/src/YCPList.cc 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/YCPList.cc 2012-06-26 13:54:01.000000000 +0200 @@ -28,7 +28,6 @@ #include "ycp/YCPCodeCompare.h" #include "ycp/ExecutionEnvironment.h" -extern ExecutionEnvironment ee; // YCPListRep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/YCPMap.cc new/yast2-core-2.23.4/libycp/src/YCPMap.cc --- old/yast2-core-2.23.3/libycp/src/YCPMap.cc 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/YCPMap.cc 2012-06-26 13:54:01.000000000 +0200 @@ -24,7 +24,6 @@ #include "ycp/Xmlcode.h" #include "ycp/ExecutionEnvironment.h" -extern ExecutionEnvironment ee; // YCPMapRep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/YCPString.cc new/yast2-core-2.23.4/libycp/src/YCPString.cc --- old/yast2-core-2.23.3/libycp/src/YCPString.cc 2012-06-18 14:23:16.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/YCPString.cc 2012-06-26 13:54:01.000000000 +0200 @@ -40,7 +40,7 @@ YCPStringRep::YCPStringRep(const wstring& s) : v(), is_ascii(false) { - wchar2utf8(s, &v); + YaST::wchar2utf8(s, &v); is_ascii = all_of(v.begin(), v.end(), isascii); } @@ -63,7 +63,7 @@ YCPStringRep::wvalue() const { std::wstring ret; - utf82wchar(v, &ret); + YaST::utf82wchar(v, &ret); return ret; } @@ -87,7 +87,7 @@ std::wstring wa, wb; - if (utf82wchar (a, &wa) && utf82wchar (b, &wb)) + if (YaST::utf82wchar (a, &wa) && YaST::utf82wchar (b, &wb)) tmp = wcscoll (wa.c_str (), wb.c_str ()); else tmp = strcoll (a, b); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/YExpression.cc new/yast2-core-2.23.4/libycp/src/YExpression.cc --- old/yast2-core-2.23.3/libycp/src/YExpression.cc 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/YExpression.cc 2012-06-26 13:54:01.000000000 +0200 @@ -1038,8 +1038,7 @@ //FIXME: save declaration/ptr to propagation function instead of from & to if (m_from->isFloat()) { - extern ExecutionEnvironment ee; - ycp2warning (ee.filename().c_str(), ee.linenumber(), "Implicit float conversion will loose accuracy"); + ycp2warning(YaST::ee.filename().c_str(), YaST::ee.linenumber(), "Implicit float conversion will loose accuracy"); } } @@ -1502,8 +1501,7 @@ if (expr.isNull () || expr->isVoid()) { - extern ExecutionEnvironment ee; - ycp2warning (ee.filename().c_str(), ee.linenumber(), "Condition expression evaluates to nil in ?: expression, using false instead."); + ycp2warning(YaST::ee.filename().c_str(), YaST::ee.linenumber(), "Condition expression evaluates to nil in ?: expression, using false instead."); return m_false->evaluate (); } @@ -2373,8 +2371,7 @@ // no match, try with untyped variable type = Type::Any; - extern ExecutionEnvironment ee; - ycp2warning (ee.filename().c_str(), ee.linenumber(), "Parameter '%s' has unspecified type", name); + ycp2warning(YaST::ee.filename().c_str(), YaST::ee.linenumber(), "Parameter '%s' has unspecified type", name); } addedType = VariableTypePtr (new VariableType (type)); // it's a typed symbolic variable @@ -3112,27 +3109,25 @@ m_functioncall->attachParameter (evaluated_params[p], p); } - extern ExecutionEnvironment ee; - // save the context info - int linenumber = ee.linenumber (); - string filename = ee.filename (); + int linenumber = YaST::ee.linenumber(); + string filename = YaST::ee.filename(); - if (ee.endlessRecursion ()) + if (YaST::ee.endlessRecursion()) { ycp2error ("Returning nil instead of calling the function."); return YCPVoid (); } - ee.pushframe ((YECallPtr)this, evaluated_params); + YaST::ee.pushframe((YECallPtr)this, evaluated_params); YCPValue value = m_functioncall->evaluateCall (); // restore the context info - ee.setLinenumber (linenumber); - ee.setFilename (filename); + YaST::ee.setLinenumber(linenumber); + YaST::ee.setFilename(filename); - ee.popframe (); + YaST::ee.popframe(); #if DO_DEBUG y2debug("evaluate done (%s) = '%s'", qualifiedName ().c_str(), value.isNull() ? "NULL" : value->toString().c_str()); @@ -3254,17 +3249,15 @@ m_functioncall->attachParameter (m_params[p], p); } - extern ExecutionEnvironment ee; - // save the context info - int linenumber = ee.linenumber (); - string filename = ee.filename (); + int linenumber = YaST::ee.linenumber(); + string filename = YaST::ee.filename(); YCPValue value = m_functioncall->evaluateCall (); // restore the context info - ee.setLinenumber (linenumber); - ee.setFilename (filename); + YaST::ee.setLinenumber(linenumber); + YaST::ee.setFilename(filename); #if DO_DEBUG y2debug("evaluate done (%s) = '%s'", qualifiedName ().c_str(), value.isNull() ? "NULL" : value->toString().c_str()); @@ -3357,11 +3350,9 @@ formalp->setValue (value); } - extern ExecutionEnvironment ee; - // save the context info - int linenumber = ee.linenumber (); - string filename = ee.filename (); + int linenumber = YaST::ee.linenumber(); + string filename = YaST::ee.filename(); YCPValue value = definition->evaluate (); @@ -3372,8 +3363,8 @@ } // restore the context info - ee.setLinenumber (linenumber); - ee.setFilename (filename); + YaST::ee.setLinenumber(linenumber); + YaST::ee.setFilename(filename); // pop parameter values for recursion for (unsigned int p = 0; p < func->parameterCount(); p++) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/YStatement.cc new/yast2-core-2.23.4/libycp/src/YStatement.cc --- old/yast2-core-2.23.3/libycp/src/YStatement.cc 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/YStatement.cc 2012-06-26 13:54:01.000000000 +0200 @@ -43,7 +43,6 @@ #define DO_DEBUG 0 #endif -extern ExecutionEnvironment ee; // ------------------------------------------------------------------ @@ -1047,7 +1046,7 @@ if (!bval->isBoolean()) { - ycp2warning (ee.filename().c_str(), ee.linenumber(), "'if (%s)' evaluates to non-boolean '%s' (%s), using 'false' instead.", m_condition->toString().c_str(), bval->toString().c_str(), bval->valuetype_str()); + ycp2warning(YaST::ee.filename().c_str(), YaST::ee.linenumber(), "'if (%s)' evaluates to non-boolean '%s' (%s), using 'false' instead.", m_condition->toString().c_str(), bval->toString().c_str(), bval->valuetype_str()); bval = YCPBoolean (false); } if (bval->asBoolean()->value() == true) @@ -1628,7 +1627,7 @@ YCPValue YSInclude::evaluate (bool cse) { - if (!cse && !m_skipped) ee.setFilename (m_filename); + if (!cse && !m_skipped) YaST::ee.setFilename(m_filename); return YCPNull(); } @@ -1851,7 +1850,7 @@ #if DO_DEBUG y2debug( "YSFilename to set %s", m_filename->c_str ()); #endif - if (! cse) ee.setFilename (m_filename.asString()); + if (! cse) YaST::ee.setFilename(m_filename.asString()); return YCPNull (); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/include/ycp/ExecutionEnvironment.h new/yast2-core-2.23.4/libycp/src/include/ycp/ExecutionEnvironment.h --- old/yast2-core-2.23.3/libycp/src/include/ycp/ExecutionEnvironment.h 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/include/ycp/ExecutionEnvironment.h 2012-06-26 13:54:01.000000000 +0200 @@ -26,6 +26,9 @@ using namespace std; +namespace YaST +{ + /// Function and source location, for backtraces struct CallFrame { YECallPtr function; @@ -33,12 +36,9 @@ int linenumber; YCPValue* params; - CallFrame (string f, int l, YECallPtr func, YCPValue* p): - function (func), - filename (f), - linenumber (l) + CallFrame(const string& f, int l, YECallPtr func, YCPValue* p) + : function(func), filename(f), linenumber(l), params(p) { - params = p; } }; @@ -85,7 +85,7 @@ /** * Get the current file name. */ - const string filename () const; + const string& filename() const; /** * Set the current file name for error outputs. @@ -137,4 +137,8 @@ CallStack callstack() const; }; + + extern ExecutionEnvironment ee; +} + #endif /* _execution_environment_h */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/include/ycp/y2log.h new/yast2-core-2.23.4/libycp/src/include/ycp/y2log.h --- old/yast2-core-2.23.3/libycp/src/include/ycp/y2log.h 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/include/ycp/y2log.h 2012-06-26 13:54:01.000000000 +0200 @@ -40,13 +40,7 @@ y2ycp(LOG_WARNING,file,line,format,##args) #define ycp2error(format,args...) \ do { \ - extern ExecutionEnvironment ee; \ - y2ycp(LOG_ERROR, ee.filename().c_str(), ee.linenumber(), format, ##args); \ - } while (0) -#define ycp2error(format,args...) \ - do { \ - extern ExecutionEnvironment ee; \ - y2ycp(LOG_ERROR, ee.filename().c_str(), ee.linenumber(), format, ##args); \ + y2ycp(LOG_ERROR, YaST::ee.filename().c_str(), YaST::ee.linenumber(), format, ##args); \ } while (0) #define ycp2security(file,line,format,args...) \ y2ycp(LOG_SECURITY,file,line,format,##args) @@ -56,8 +50,7 @@ // logging cleanup #define ycp_log(level,format,args...) \ do { \ - extern ExecutionEnvironment ee; \ - y2_logger(level, Y2LOG, ee.filename().c_str(), ee.linenumber(), "", format, ##args); \ + y2_logger(level, Y2LOG, YaST::ee.filename().c_str(), YaST::ee.linenumber(), "", format, ##args); \ } while (0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/include/ycp/y2string.h new/yast2-core-2.23.4/libycp/src/include/ycp/y2string.h --- old/yast2-core-2.23.3/libycp/src/include/ycp/y2string.h 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/include/ycp/y2string.h 2012-06-26 13:54:01.000000000 +0200 @@ -14,6 +14,9 @@ #include <string> +namespace YaST +{ + bool recode (iconv_t cd, const std::string& in, std::string* out); @@ -56,5 +59,6 @@ bool wchar2utf8 (const std::wstring& in, std::string* out); +} #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/parser.yy new/yast2-core-2.23.4/libycp/src/parser.yy --- old/yast2-core-2.23.3/libycp/src/parser.yy 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/parser.yy 2012-06-26 13:54:01.000000000 +0200 @@ -162,9 +162,6 @@ // for unary and binary operators extern StaticDeclaration static_declarations; -// for logging -extern ExecutionEnvironment ee; - /* * DO NOT USE static or global variables! * They make the parser non-reentrant. You need to put them into class Parser. @@ -1542,8 +1539,8 @@ break; } - ee.setLinenumber ($1.l); // if YSImport logs an error - ee.setFilename (p_parser->scanner ()->filename ()); + YaST::ee.setLinenumber($1.l); // if YSImport logs an error + YaST::ee.setFilename(p_parser->scanner()->filename()); YSImportPtr imp = new YSImport (module, $1.l); if (imp->name().empty()) { @@ -2285,7 +2282,7 @@ } else if (match > 0) // propagated match { - ee.setLinenumber ($3.l); + YaST::ee.setLinenumber($3.l); $3.c = new YEPropagate ($3.c, $3.t, $1.t); match = 0; } @@ -2808,7 +2805,7 @@ if (match > 0) { - ee.setLinenumber ($3.l); + YaST::ee.setLinenumber($3.l); $3.c = new YEPropagate ($3.c, $3.t, $1.t); } @@ -4062,7 +4059,7 @@ decl = static_declarations.findDeclaration (op, ft1); if (decl != 0) { - ee.setLinenumber (e1->l); + YaST::ee.setLinenumber(e1->l); e1->c = new YEPropagate (e1->c, e1->t, e2->t); ft = ft1; } @@ -4076,7 +4073,7 @@ decl = static_declarations.findDeclaration (op, ft1); if (decl != 0) { - ee.setLinenumber (e2->l); + YaST::ee.setLinenumber(e2->l); e2->c = new YEPropagate (e2->c, e2->t, e1->t); ft = ft1; } @@ -4175,13 +4172,13 @@ if ((e1_match_e2 > e2_match_e1) && (e2_match_e1 > 0)) { - ee.setLinenumber (e1->l); + YaST::ee.setLinenumber(e1->l); e1->c = new YEPropagate (e1->c, e1->t, e2->t); // propagate e1 } else if ((e2_match_e1 > e1_match_e2) && (e1_match_e2 > 0)) { - ee.setLinenumber (e2->l); + YaST::ee.setLinenumber(e2->l); e2->c = new YEPropagate (e2->c, e2->t, e1->t); // propagate e2 } @@ -4290,7 +4287,7 @@ y2debug ("attach_parameter (p %p(%s:%s), p1 %p)", parm, parm1 ? parm->t->toString().c_str() : parm->c->toString().c_str(), parm1 ? "" : parm->t->toString().c_str(), parm1); #endif - ee.setLinenumber (parm->l); + YaST::ee.setLinenumber(parm->l); constTypePtr t; string name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/y2crypt.cc new/yast2-core-2.23.4/libycp/src/y2crypt.cc --- old/yast2-core-2.23.3/libycp/src/y2crypt.cc 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/y2crypt.cc 2012-06-26 13:54:01.000000000 +0200 @@ -28,6 +28,8 @@ #include "y2log.h" #include "y2crypt.h" +namespace YaST +{ static int read_loop (int fd, char* buffer, int count) @@ -182,3 +184,5 @@ *encrypted = string (newencrypted); return true; } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/y2crypt.h new/yast2-core-2.23.4/libycp/src/y2crypt.h --- old/yast2-core-2.23.3/libycp/src/y2crypt.h 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/y2crypt.h 2012-06-26 13:54:01.000000000 +0200 @@ -13,11 +13,14 @@ using std::string; +namespace YaST +{ enum crypt_t { CRYPT, MD5, BLOWFISH, SHA256, SHA512 }; bool crypt_pass (string unencrypted, crypt_t use_crypt, string* encrypted); +} #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/src/y2string.cc new/yast2-core-2.23.4/libycp/src/y2string.cc --- old/yast2-core-2.23.3/libycp/src/y2string.cc 2012-06-18 14:23:16.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/src/y2string.cc 2012-06-26 13:54:01.000000000 +0200 @@ -11,6 +11,9 @@ #include "y2string.h" +namespace YaST +{ + template <class In, class Out> void recode_errors(const In& in, const Out* out) { @@ -159,3 +162,5 @@ return recode (cd, in, out); } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/testsuite/runycp.cc new/yast2-core-2.23.4/libycp/testsuite/runycp.cc --- old/yast2-core-2.23.3/libycp/testsuite/runycp.cc 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/testsuite/runycp.cc 2012-06-26 13:54:01.000000000 +0200 @@ -29,7 +29,6 @@ #include <y2/Y2Component.h> #include <y2/Y2ComponentCreator.h> -extern ExecutionEnvironment ee; class TestY2Component : public Y2Component { virtual Y2Namespace *import (const char* name) @@ -171,7 +170,7 @@ if (make_depends) parser->setDepends(); - ee.setFilename (string (fname)); + YaST::ee.setFilename(string(fname)); YCodePtr code = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/testsuite/testSignature.cc new/yast2-core-2.23.4/libycp/testsuite/testSignature.cc --- old/yast2-core-2.23.3/libycp/testsuite/testSignature.cc 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/testsuite/testSignature.cc 2012-06-26 13:54:01.000000000 +0200 @@ -15,7 +15,6 @@ using namespace std; -ExecutionEnvironment ee; void fromSig (const char *s, constTypePtr t, string ts) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/testsuite/tests/builtin/Backtrace.err new/yast2-core-2.23.4/libycp/testsuite/tests/builtin/Backtrace.err --- old/yast2-core-2.23.3/libycp/testsuite/tests/builtin/Backtrace.err 2012-06-18 07:38:09.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/testsuite/tests/builtin/Backtrace.err 2012-06-26 13:54:01.000000000 +0200 @@ -21,8 +21,8 @@ } ---------------------------------------------------------------------- [YCP] tests/builtin/Backtrace.ycp:6 My test -[libycp] ExecutionEnvironment.cc(backtrace):132 ------------- Backtrace begin ------------- +[libycp] ExecutionEnvironment.cc(backtrace):138 ------------- Backtrace begin ------------- [YCP] tests/builtin/Backtrace.ycp:10 void aoo (integer value) [YCP] tests/builtin/Backtrace.ycp:14 void boo (integer value) [YCP] tests/builtin/Backtrace.ycp:17 void foo (integer foo_val) -[libycp] ExecutionEnvironment.cc(backtrace):141 ------------- Backtrace end --------------- +[libycp] ExecutionEnvironment.cc(backtrace):147 ------------- Backtrace end --------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/libycp/testsuite/tests/statements/deep_recursion.err new/yast2-core-2.23.4/libycp/testsuite/tests/statements/deep_recursion.err --- old/yast2-core-2.23.3/libycp/testsuite/tests/statements/deep_recursion.err 2012-06-18 07:38:11.000000000 +0200 +++ new/yast2-core-2.23.4/libycp/testsuite/tests/statements/deep_recursion.err 2012-06-26 13:54:01.000000000 +0200 @@ -13,7 +13,7 @@ return Multiply (10000, 42); } ---------------------------------------------------------------------- -[libycp] ExecutionEnvironment.cc(endlessRecursion):96 Recursion limit of 1001 call frames reached. Set the environment variable Y2RECURSIONLIMIT to change this +[libycp] ExecutionEnvironment.cc(endlessRecursion):102 Recursion limit of 1001 call frames reached. Set the environment variable Y2RECURSIONLIMIT to change this [Interpreter] tests/statements/deep_recursion.ycp:5 Returning nil instead of calling the function. [Interpreter] tests/statements/deep_recursion.ycp:5 Argument (Multiply ((a - 1), b)) to +(...) evaluates to nil [Interpreter] tests/statements/deep_recursion.ycp:5 Argument (Multiply ((a - 1), b)) to +(...) evaluates to nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/scr/src/ScriptingAgent.cc new/yast2-core-2.23.4/scr/src/ScriptingAgent.cc --- old/yast2-core-2.23.3/scr/src/ScriptingAgent.cc 2012-06-18 07:38:12.000000000 +0200 +++ new/yast2-core-2.23.4/scr/src/ScriptingAgent.cc 2012-06-26 13:54:01.000000000 +0200 @@ -427,8 +427,7 @@ void ScriptingAgent::Sweep () { - extern ExecutionEnvironment ee; - ycp2warning (ee.filename().c_str(), ee.linenumber(), "Scripting agent sweeping"); + ycp2warning(YaST::ee.filename().c_str(), YaST::ee.linenumber(), "Scripting agent sweeping"); for (int level = 0; level < Y2PathSearch::numberOfComponentLevels (); level++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-2.23.3/wfm/src/Y2WFMComponent.cc new/yast2-core-2.23.4/wfm/src/Y2WFMComponent.cc --- old/yast2-core-2.23.3/wfm/src/Y2WFMComponent.cc 2012-06-18 07:38:12.000000000 +0200 +++ new/yast2-core-2.23.4/wfm/src/Y2WFMComponent.cc 2012-06-26 13:54:01.000000000 +0200 @@ -41,7 +41,6 @@ #include "Y2WFMComponent.h" #include "Y2SystemNamespace.h" -extern ExecutionEnvironment ee; Y2WFMComponent* Y2WFMComponent::current_wfm = 0; @@ -716,15 +715,15 @@ Y2Component* client_comp = Y2ComponentBroker::createClient (new_modulename.c_str ()); if (client_comp) { - string filename = ee.filename (); - int linenumber = ee.linenumber (); + string filename = YaST::ee.filename(); + int linenumber = YaST::ee.linenumber(); ycp2milestone (filename.c_str(), linenumber, "Calling YaST client %s", new_modulename.c_str ()); ycp2debug (filename.c_str(), linenumber, "(arguments: %s)", args->toString ().c_str ()); YCPValue result = client_comp->doActualWork (args, NULL); - ee.setFilename (filename); - ee.setLinenumber (linenumber); + YaST::ee.setFilename(filename); + YaST::ee.setLinenumber(linenumber); ycp2milestone (filename.c_str(), linenumber, "Called YaST client returned."); // some clients return plaintext secrets #248300 ycp2debug (filename.c_str(), linenumber, -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org