Hello community,
here is the log from the commit of package yast2-core for openSUSE:Factory
checked in at Wed Jun 10 18:35:54 CEST 2009.
--------
--- yast2-core/yast2-core.changes 2009-06-01 09:20:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-core/yast2-core.changes 2009-06-09 16:43:39.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Jun 9 15:51:09 CEST 2009 - mvidner@suse.cz
+
+- Added 'string float::tolstring(float f, integer precision)' using the
+ current locale decimal separator (bnc#460094).
+- Fixed makefiles to work with "install" calls changed via
+ automake-1.11.
+- Fixed tons of warnings by explicitly initializing all members of
+ declaration_t.
+- 2.18.12
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-core-2.18.11.tar.bz2
New:
----
yast2-core-2.18.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-core.spec ++++++
--- /var/tmp/diff_new_pack.c27756/_old 2009-06-10 18:35:32.000000000 +0200
+++ /var/tmp/diff_new_pack.c27756/_new 2009-06-10 18:35:32.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-core (Version 2.18.11)
+# spec file for package yast2-core (Version 2.18.12)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-core
-Version: 2.18.11
+Version: 2.18.12
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-core-2.18.11.tar.bz2
+Source0: yast2-core-2.18.12.tar.bz2
Prefix: /usr
# obviously
BuildRequires: gcc-c++
@@ -95,7 +95,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-core-2.18.11
+%setup -n yast2-core-2.18.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -105,7 +105,9 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
@@ -189,7 +191,16 @@
%doc %{prefix}/share/doc/packages/yast2-core
%doc %{_datadir}/doc/yastdoc
/usr/share/YaST2/data/devtools/bin/generateYCPWrappers
+
%changelog
+* Tue Jun 09 2009 mvidner@suse.cz
+- Added 'string float::tolstring(float f, integer precision)' using the
+ current locale decimal separator (bnc#460094).
+- Fixed makefiles to work with "install" calls changed via
+ automake-1.11.
+- Fixed tons of warnings by explicitly initializing all members of
+ declaration_t.
+- 2.18.12
* Mon Jun 01 2009 mvidner@suse.cz
- Fixed char* constness for glibc-2.10.
- 2.18.11
++++++ yast2-core-2.18.11.tar.bz2 -> yast2-core-2.18.12.tar.bz2 ++++++
++++ 44013 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.11/configure.in new/yast2-core-2.18.12/configure.in
--- old/yast2-core-2.18.11/configure.in 2009-06-01 08:57:45.000000000 +0200
+++ new/yast2-core-2.18.12/configure.in 2009-06-09 16:24:27.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-core, 2.18.11, http://bugs.opensuse.org/, yast2-core)
+AC_INIT(yast2-core, 2.18.12, 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.18.11"
+VERSION="2.18.12"
RPMNAME="yast2-core"
MAINTAINER="Martin Vidner "
@@ -92,7 +92,9 @@
AC_SYS_LARGEFILE
-
+dnl Automake 1.11 enables silent compilation,
+dnl Disable it by "configure --disable-silent-rules" or "make V=1"
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
yastdocdir=\${datadir}/doc/yastdoc/html
AC_SUBST(yastdocdir)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.11/libscr/src/SCR.cc new/yast2-core-2.18.12/libscr/src/SCR.cc
--- old/yast2-core-2.18.11/libscr/src/SCR.cc 2008-10-14 16:38:38.000000000 +0200
+++ new/yast2-core-2.18.12/libscr/src/SCR.cc 2009-06-09 14:42:09.000000000 +0200
@@ -15,7 +15,7 @@
Authors: Klaus Kaempf
Maintainer: Klaus Kaempf
-$Id: SCR.cc 52188 2008-10-14 14:38:36Z mvidner $
+$Id: SCR.cc 57511 2009-06-09 12:42:08Z mvidner $
/-*/
#include "scr/SCR.h"
@@ -380,24 +380,28 @@
// must be static, registerDeclarations saves a pointer to it!
static declaration_t declarations[] = {
- { "SCR", "", 0, DECL_NAMESPACE },
- { "Read", "any (path)", (void *)SCRRead },
- { "Read", "any (path, any)", (void *)SCRRead2 },
- { "Read", "any (path, any, any)", (void *)SCRRead3 },
- { "Write", "boolean (path, any)", (void *)SCRWrite2, DECL_NIL },
- { "Write", "boolean (path, any, any)", (void *)SCRWrite3 },
- { "Dir", "list<string> (path)", (void *)SCRDir },
- { "Execute", "any (path)", (void *)SCRExecute },
- { "Execute", "any (path, any)", (void *)SCRExecute2 },
- { "Execute", "any (path, any, any)", (void *)SCRExecute3 },
- { "Error", "map (path)", (void *)SCRError },
- { "RegisterAgent", "boolean (path, string)", (void *)SCRRegisterAgentS },
- { "RegisterAgent", "boolean (path, term)", (void *)SCRRegisterAgentT },
- { "UnregisterAgent", "boolean (path)", (void *)SCRUnregisterAgent },
- { "UnregisterAllAgents","boolean ()", (void *)SCRUnregisterAllAgents },
- { "UnmountAgent", "boolean (path)", (void *)SCRUnmountAgent },
- { "RegisterNewAgents", "boolean ()", (void *)SCRRegisterNewAgents },
- { 0 }
+#define ETC 0, NULL, constTypePtr(), NULL
+#define ETCf NULL, constTypePtr(), NULL
+ { "SCR", "", NULL, DECL_NAMESPACE, ETCf },
+ { "Read", "any (path)", (void *)SCRRead, ETC },
+ { "Read", "any (path, any)", (void *)SCRRead2, ETC },
+ { "Read", "any (path, any, any)", (void *)SCRRead3, ETC },
+ { "Write", "boolean (path, any)", (void *)SCRWrite2, DECL_NIL, ETCf },
+ { "Write", "boolean (path, any, any)", (void *)SCRWrite3, ETC },
+ { "Dir", "list<string> (path)", (void *)SCRDir, ETC },
+ { "Execute", "any (path)", (void *)SCRExecute, ETC },
+ { "Execute", "any (path, any)", (void *)SCRExecute2, ETC },
+ { "Execute", "any (path, any, any)", (void *)SCRExecute3, ETC },
+ { "Error", "map (path)", (void *)SCRError, ETC },
+ { "RegisterAgent", "boolean (path, string)", (void *)SCRRegisterAgentS, ETC },
+ { "RegisterAgent", "boolean (path, term)", (void *)SCRRegisterAgentT, ETC },
+ { "UnregisterAgent", "boolean (path)", (void *)SCRUnregisterAgent, ETC },
+ { "UnregisterAllAgents","boolean ()", (void *)SCRUnregisterAllAgents,ETC },
+ { "UnmountAgent", "boolean (path)", (void *)SCRUnmountAgent, ETC },
+ { "RegisterNewAgents", "boolean ()", (void *)SCRRegisterNewAgents, ETC },
+ { NULL, NULL, NULL, ETC }
+#undef ETC
+#undef ETCf
};
static_declarations.registerDeclarations ("SCR", declarations);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.11/liby2/src/Y2ProgramComponent.cc new/yast2-core-2.18.12/liby2/src/Y2ProgramComponent.cc
--- old/yast2-core-2.18.11/liby2/src/Y2ProgramComponent.cc 2009-05-07 15:30:28.000000000 +0200
+++ new/yast2-core-2.18.12/liby2/src/Y2ProgramComponent.cc 2009-06-01 16:19:15.000000000 +0200
@@ -265,8 +265,13 @@
{
y2debug ("launchExternalProgram (%s, %s, ...)", argv[0], argv[1]);
// Create socket-pair
- pipe(to_external);
- pipe(from_external);
+ int err;
+ err = pipe(to_external);
+ if (err != 0)
+ y2error("pipe failed: %s", strerror (errno));
+ err = pipe(from_external);
+ if (err != 0)
+ y2error("pipe failed: %s", strerror (errno));
// Create module process
@@ -380,39 +385,7 @@
void Y2ProgramComponent::sendToExternal(const YCPValue& value)
{
- if (!externalProgramOK())
- {
- y2error ("External program %s died unexpectedly", bin_file.c_str());
- }
-
- char *v = NULL;
-
- if (is_non_y2) v = strdup((value->toString()).c_str()); // no brackets
- else v = strdup(("(" + value->toString() + ")").c_str());
-
- bool error = (write(to_external[1], v, strlen(v)) < 0);
- if (error)
- {
- y2debug ("Error writing to external program %s: Couldn't send %s (%s)", bin_file.c_str(), v, strerror (errno));
- terminateExternalProgram();
- }
- free(v);
-
- // We send an additional linefeed. This makes it more conveniant for non
- // Y2 programs, for example that shell can do a read to get one value. For
- // Y2 programs it increases the readability if you want to dump and debug
- // the whole stream.
-
- // We MUST NOT trigger an error, if the sending of the linefeed is not
- // successful. This sporadically happens after we send a module the last
- // return just before the module has done its work and terminates. It then
- // justs sends the result(..) message, and closes down without reading the
- // linefeed. The pipe breaks down and the sending fails. But as long as we
- // don't collect the process by calling wait4, we can still read the
- // result (..) from the input pipe, which is very important. Otherwise the
- // result value would be dropped.
-
- write(to_external[1], "\n", 1);
+ sendToExternal(value->toString());
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.11/liby2util-r/src/ExternalProgram.cc new/yast2-core-2.18.12/liby2util-r/src/ExternalProgram.cc
--- old/yast2-core-2.18.11/liby2util-r/src/ExternalProgram.cc 2008-12-22 12:58:29.000000000 +0100
+++ new/yast2-core-2.18.12/liby2util-r/src/ExternalProgram.cc 2009-06-01 15:51:58.000000000 +0200
@@ -217,8 +217,10 @@
// unix guru knowledge ;-) )
char name[512];
- ttyname_r(slave_tty, name, sizeof(name));
- ::close(open(name, O_RDONLY));
+ int err = ttyname_r(slave_tty, name, sizeof(name));
+ if (err == 0)
+ ::close(open(name, O_RDONLY));
+ // else error
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.11/liby2util-r/testsuite/test_chroot.cc new/yast2-core-2.18.12/liby2util-r/testsuite/test_chroot.cc
--- old/yast2-core-2.18.11/liby2util-r/testsuite/test_chroot.cc 2007-11-13 13:33:02.000000000 +0100
+++ new/yast2-core-2.18.12/liby2util-r/testsuite/test_chroot.cc 2009-06-01 15:56:12.000000000 +0200
@@ -11,7 +11,7 @@
cout << "must specify directory to chroot to" << endl;
return 1;
}
- char* aa[] = { "ls" , "-al", NULL };
+ const char* aa[] = { "ls" , "-al", NULL };
// string aa = "ls";
ExternalProgram* prog = new ExternalProgram(aa, ExternalProgram::Stderr_To_Stdout,
false, -1, true, argv[1]);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.11/libycp/doc/Makefile.am new/yast2-core-2.18.12/libycp/doc/Makefile.am
--- old/yast2-core-2.18.11/libycp/doc/Makefile.am 2008-08-18 11:00:50.000000000 +0200
+++ new/yast2-core-2.18.12/libycp/doc/Makefile.am 2009-06-09 10:29:48.000000000 +0200
@@ -10,7 +10,7 @@
xmlfiles = combined.xml
# needed for building the overall documentation
xmlfilesseparated := $(foreach xml,$(builtinxml),$(notdir $(xml)))
-htmlfiles = $(wildcard html/*.html html/*/*.html)
+htmlfiles = $(filter-out html/index.html,$(wildcard html/*.html html/*/*.html))
html_DATA = \
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/admon/caution.gif and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/admon/caution.gif differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/admon/caution.png and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/admon/caution.png differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/admon/caution.tif and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/admon/caution.tif differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/admon/important.gif and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/admon/important.gif differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/admon/important.png and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/admon/important.png differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/admon/important.tif and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/admon/important.tif differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/admon/note.gif and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/admon/note.gif differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/admon/note.png and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/admon/note.png differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/admon/note.tif and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/admon/note.tif differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/admon/tip.gif and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/admon/tip.gif differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/admon/tip.png and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/admon/tip.png differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/admon/tip.tif and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/admon/tip.tif differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/admon/warning.gif and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/admon/warning.gif differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/admon/warning.png and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/admon/warning.png differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/admon/warning.tif and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/admon/warning.tif differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/draft.png and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/draft.png differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/navig/home.png and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/navig/home.png differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/navig/next.png and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/navig/next.png differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/navig/prev.png and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/navig/prev.png differ
Files old/yast2-core-2.18.11/libycp/doc/ycp/html/images/navig/up.png and new/yast2-core-2.18.12/libycp/doc/ycp/html/images/navig/up.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.11/libycp/doc/ycp/Makefile.am new/yast2-core-2.18.12/libycp/doc/ycp/Makefile.am
--- old/yast2-core-2.18.11/libycp/doc/ycp/Makefile.am 2006-09-25 18:11:14.000000000 +0200
+++ new/yast2-core-2.18.12/libycp/doc/ycp/Makefile.am 2009-06-09 10:19:22.000000000 +0200
@@ -15,7 +15,7 @@
html/index.html: ycp.xml customize-html.xsl
$(XSLTPROC) $(XSLTPROC_FLAGS) customize-html.xsl ycp.xml
-html_DATA = $(wildcard html/*)
+html_DATA = $(wildcard html/*.*)
EXTRA_DIST = *.xml $(html_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.11/libycp/src/YCPBuiltinByteblock.cc new/yast2-core-2.18.12/libycp/src/YCPBuiltinByteblock.cc
--- old/yast2-core-2.18.11/libycp/src/YCPBuiltinByteblock.cc 2008-07-28 10:54:03.000000000 +0200
+++ new/yast2-core-2.18.12/libycp/src/YCPBuiltinByteblock.cc 2009-06-09 14:12:40.000000000 +0200
@@ -79,9 +79,13 @@
{
// must be static, registerDeclarations saves a pointer to it!
static declaration_t declarations[] = {
- { "tobyteblock","byteblock (const any)", (void *)b_tobyteblock },
- { "size", "integer (const byteblock)", (void *)b_size },
- { 0 }
+#define ETC 0, NULL, constTypePtr(), NULL
+#define ETCf NULL, constTypePtr(), NULL
+ { "tobyteblock","byteblock (const any)", (void *)b_tobyteblock, ETC },
+ { "size", "integer (const byteblock)", (void *)b_size, ETC },
+ { NULL, NULL, NULL, ETC }
+#undef ETC
+#undef ETCf
};
static_declarations.registerDeclarations ("YCPBuiltinByteblock", declarations);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.11/libycp/src/YCPBuiltinFloat.cc new/yast2-core-2.18.12/libycp/src/YCPBuiltinFloat.cc
--- old/yast2-core-2.18.11/libycp/src/YCPBuiltinFloat.cc 2009-01-12 12:06:57.000000000 +0100
+++ new/yast2-core-2.18.12/libycp/src/YCPBuiltinFloat.cc 2009-06-09 15:49:19.000000000 +0200
@@ -22,6 +22,7 @@
#include
#include
#include
+#include <sstream>
#include "ycp/YCPBuiltinFloat.h"
#include "ycp/YCPFloat.h"
@@ -265,6 +266,35 @@
}
+// bnc#460094
+static YCPValue
+f_tolstring (const YCPFloat &f, const YCPInteger &precision)
+{
+ /**
+ * @builtin float::tolstring
+ * @short Converts a floating point number to a localized string
+ * @description
+ * Converts a floating point number to a localized string, using the
+ * specified precision.
+ * @param float FLOAT
+ * @param integer PRECISION
+ * @return string
+ * @usage tostring (0.12345, 4) -> 0,1235
+ */
+
+ if (f.isNull () || precision.isNull ())
+ return YCPNull ();
+
+ std::ostringstream ss;
+ ss.imbue (std::locale (""));
+ ss.precision (precision->value ());
+ ss << f->value ();
+ YCPString ret (ss.str ());
+
+ return ret;
+}
+
+
static YCPValue
f_tofloat (const YCPValue &v)
{
@@ -306,29 +336,35 @@
YCPBuiltinFloat::YCPBuiltinFloat ()
{
+#define ETC 0, NULL, constTypePtr(), NULL
+#define ETCf NULL, constTypePtr(), NULL
+
// must be static, registerDeclarations saves a pointer to it!
static declaration_t declarations[] = {
- { "+", "float (float, float)", (void *)f_plus },
- { "-", "float (float, float)", (void *)f_minus },
- { "-", "float (float)", (void *)f_neg },
- { "*", "float (float, float)", (void *)f_mult },
- { "/", "float (float, float)", (void *)f_div },
- { "tofloat", "float (const any)", (void *)f_tofloat },
- { "tostring","string (float, integer)", (void *)f_tostring },
- { 0 }
+ { "+", "float (float, float)", (void *)f_plus, ETC },
+ { "-", "float (float, float)", (void *)f_minus, ETC },
+ { "-", "float (float)", (void *)f_neg, ETC },
+ { "*", "float (float, float)", (void *)f_mult, ETC },
+ { "/", "float (float, float)", (void *)f_div, ETC },
+ { "tofloat", "float (const any)", (void *)f_tofloat, ETC },
+ { "tostring","string (float, integer)", (void *)f_tostring, ETC },
+ { NULL, NULL, NULL, ETC }
};
// must be static, registerDeclarations saves a pointer to it!
static declaration_t declarations_ns[] = {
- { "float", "", NULL, DECL_NAMESPACE },
- { "abs", "float (float)", (void *)f_abs },
- { "floor", "float (float)", (void *)f_floor },
- { "ceil", "float (float)", (void *)f_ceil },
- { "trunc", "float (float)", (void *)f_trunc },
- { "pow", "float (float, float)", (void *)f_pow },
- { 0 }
+ { "float", "", NULL, DECL_NAMESPACE, ETCf },
+ { "abs", "float (float)", (void *)f_abs, ETC },
+ { "floor", "float (float)", (void *)f_floor, ETC },
+ { "ceil", "float (float)", (void *)f_ceil, ETC },
+ { "trunc", "float (float)", (void *)f_trunc, ETC },
+ { "pow", "float (float, float)", (void *)f_pow, ETC },
+ { "tolstring","string (float, integer)",(void *)f_tolstring, ETC },
+ { NULL, NULL, NULL, ETC }
};
static_declarations.registerDeclarations ("YCPBuiltinFloat", declarations);
static_declarations.registerDeclarations ("YCPBuiltinFloat", declarations_ns);
+#undef ETC
+#undef ETCf
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.11/libycp/src/YCPBuiltinInteger.cc new/yast2-core-2.18.12/libycp/src/YCPBuiltinInteger.cc
--- old/yast2-core-2.18.11/libycp/src/YCPBuiltinInteger.cc 2008-06-25 11:22:02.000000000 +0200
+++ new/yast2-core-2.18.12/libycp/src/YCPBuiltinInteger.cc 2009-06-09 14:14:03.000000000 +0200
@@ -309,20 +309,24 @@
{
// must be static, registerDeclarations saves a pointer to it!
static declaration_t declarations[] = {
- { "+", "integer (integer, integer)", (void *)i_plus },
- { "-", "integer (integer, integer)", (void *)i_minus },
- { "-", "integer (integer)", (void *)i_neg },
- { "*", "integer (integer, integer)", (void *)i_mult },
- { "/", "integer (integer, integer)", (void *)i_div },
- { "%", "integer (integer, integer)", (void *)i_mod },
- { "&", "integer (integer, integer)", (void *)i_and },
- { "^", "integer (integer, integer)", (void *)i_xor },
- { "|", "integer (integer, integer)", (void *)i_or },
- { "<<", "integer (integer, integer)", (void *)i_left },
- { ">>", "integer (integer, integer)", (void *)i_right },
- { "~", "integer (integer)", (void *)i_bnot },
- { "tointeger", "integer (const any)", (void *)i_tointeger },
- { 0 }
+#define ETC 0, NULL, constTypePtr(), NULL
+#define ETCf NULL, constTypePtr(), NULL
+ { "+", "integer (integer, integer)", (void *)i_plus, ETC },
+ { "-", "integer (integer, integer)", (void *)i_minus, ETC },
+ { "-", "integer (integer)", (void *)i_neg, ETC },
+ { "*", "integer (integer, integer)", (void *)i_mult, ETC },
+ { "/", "integer (integer, integer)", (void *)i_div, ETC },
+ { "%", "integer (integer, integer)", (void *)i_mod, ETC },
+ { "&", "integer (integer, integer)", (void *)i_and, ETC },
+ { "^", "integer (integer, integer)", (void *)i_xor, ETC },
+ { "|", "integer (integer, integer)", (void *)i_or, ETC },
+ { "<<", "integer (integer, integer)", (void *)i_left, ETC },
+ { ">>", "integer (integer, integer)", (void *)i_right, ETC },
+ { "~", "integer (integer)", (void *)i_bnot, ETC },
+ { "tointeger", "integer (const any)", (void *)i_tointeger,ETC },
+ { NULL, NULL, NULL, ETC }
+#undef ETC
+#undef ETCf
};
static_declarations.registerDeclarations ("YCPBuiltinInteger", declarations);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.11/libycp/src/YCPBuiltinList.cc new/yast2-core-2.18.12/libycp/src/YCPBuiltinList.cc
--- old/yast2-core-2.18.11/libycp/src/YCPBuiltinList.cc 2009-04-24 12:38:28.000000000 +0200
+++ new/yast2-core-2.18.12/libycp/src/YCPBuiltinList.cc 2009-06-09 14:20:51.000000000 +0200
@@ -1246,48 +1246,54 @@
YCPBuiltinList::YCPBuiltinList ()
{
+#define ETC 0, NULL, constTypePtr(), NULL
+#define ETCf NULL, constTypePtr(), NULL
+
// must be static, registerDeclarations saves a pointer to it!
static declaration_t declarations[] = {
- { "find", "flex (variable <flex>, const list <flex>, const block <boolean>)", (void *)l_find, DECL_SYMBOL|DECL_FLEX },
- { "prepend", "list <flex> (const list <flex>, const flex)", (void *)l_prepend, DECL_FLEX },
- { "contains", "boolean (const list <flex>, const flex)", (void *)l_contains, DECL_FLEX },
- { "setcontains","boolean (const list <flex>, const flex)", (void *)l_setcontains, DECL_FLEX },
- { "union", "list <any> (const list <any>, const list <any>)", (void *)l_unionlist },
- { "+", "list <flex> (const list <flex>, const list <flex>)", (void *)l_unionlist, DECL_FLEX },
- { "merge", "list <any> (const list <any>, const list <any>)", (void *)l_mergelist },
- { "sublist", "list <flex> (const list <flex>, integer)", (void *)l_sublist1, DECL_FLEX },
- { "sublist", "list <flex> (const list <flex>, integer, integer)", (void *)l_sublist2, DECL_FLEX },
- { "filter", "list <flex> (variable <flex>, const list <flex>, const block <boolean>)", (void *)l_filter, DECL_LOOP|DECL_SYMBOL|DECL_FLEX },
- { "maplist", "list <flex1> (variable <flex2>, const list <flex2>, const block <flex1>)", (void *)l_maplist, DECL_LOOP|DECL_SYMBOL|DECL_FLEX },
- { "listmap", "map (variable <flex3>, const list <flex3>, const block