[gnumeric] Compilation: deal with warning.



commit f1d70f5cba378cee461c38adf3c078aac6e73b2b
Author: Morten Welinder <terra gnome org>
Date:   Tue May 15 16:35:55 2018 -0400

    Compilation: deal with warning.

 plugins/excelplugins/ChangeLog      |    4 ++++
 plugins/excelplugins/excelplugins.c |    7 +++++++
 2 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/plugins/excelplugins/ChangeLog b/plugins/excelplugins/ChangeLog
index c895541..287ad7a 100644
--- a/plugins/excelplugins/ChangeLog
+++ b/plugins/excelplugins/ChangeLog
@@ -1,3 +1,7 @@
+2018-05-15  Morten Welinder  <terra gnome org>
+
+       * excelplugins.c (genericXLLFunction): Silence a warning.
+
 2018-05-07  Morten Welinder <terra gnome org>
 
        * Release 1.12.41
diff --git a/plugins/excelplugins/excelplugins.c b/plugins/excelplugins/excelplugins.c
index 8ce9c63..ecb61a1 100644
--- a/plugins/excelplugins/excelplugins.c
+++ b/plugins/excelplugins/excelplugins.c
@@ -498,8 +498,14 @@ genericXLLFunction (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
        m = MAX (m, MAXIMUM_NUMBER_OF_EXCEL_FUNCTION_ARGUMENTS);
        for (i = 0; i < m; ++i)
                copy_construct_xloper_from_gnm_value (x+i,argv[i],ei);
+#if 0
        m = info->number_of_arguments;
        m = MAX (m, MAXIMUM_NUMBER_OF_EXCEL_FUNCTION_ARGUMENTS);
+#else
+       // MW 20180515: it's unclear to me what is needed, but the above
+       // cannot be right.  This should be safe.
+       m = MAXIMUM_NUMBER_OF_EXCEL_FUNCTION_ARGUMENTS;
+#endif
        for (; i < m; ++i)
                x[i].xltype=xltypeMissing;
        func = (XLLFunctionWithVarArgs)info->xll_function;
@@ -507,6 +513,7 @@ genericXLLFunction (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
        currently_called_xll = info->xll;
        current_eval_info    = ei;
        switch (info->number_of_arguments) {
+       default: g_assert_not_reached ();
        case  0: r=info->xll_function (); break;
        /*
          bash script to generate code below


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]