gnumeric r16403 - in trunk: . plugins/sylk
- From: mortenw svn gnome org
- To: svn-commits-list gnome org
- Subject: gnumeric r16403 - in trunk: . plugins/sylk
- Date: Sun, 24 Feb 2008 02:06:50 +0000 (GMT)
Author: mortenw
Date: Sun Feb 24 02:06:49 2008
New Revision: 16403
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16403&view=rev
Log:
2008-02-23 Morten Welinder <terra gnome org>
* sylk.c (sylk_parse_value): Constify and fix the unqouted-string
case.
Modified:
trunk/NEWS
trunk/plugins/sylk/ChangeLog
trunk/plugins/sylk/sylk.c
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Sun Feb 24 02:06:49 2008
@@ -33,6 +33,7 @@
* Fix paste-as-text bug. [#514438]
* Fix corrupted-mps-bug. [#517141]
* Fix corrupted-qpro-bugs. [#517144] [#517376] [#517591]
+ * Fix corrupted-sylk-bug.
* Make <control>KP_Subtract work as <control>minus. [#516358]
* Make <control>KP_Add work as <control>plus.
* Fix corrupted-applix-bugs. [#517778]
Modified: trunk/plugins/sylk/sylk.c
==============================================================================
--- trunk/plugins/sylk/sylk.c (original)
+++ trunk/plugins/sylk/sylk.c Sun Feb 24 02:06:49 2008
@@ -195,19 +195,24 @@
}
static GnmValue *
-sylk_parse_value (SylkReader *state, char *str)
+sylk_parse_value (SylkReader *state, const char *str)
{
GnmValue *val;
if ('\"' == *str) { /* quoted string */
- unsigned len = strlen (str);
+ size_t len;
+
+ str++;
+ len = strlen (str);
if (str[len-1] == '\"')
- str[len-1] = '\0';
- return value_new_string (str+1);
+ len--;
+ return value_new_string_nocopy (g_strndup (str + 1, len));
}
- if (NULL != (val = format_match_simple (str)))
+ val = format_match_simple (str);
+ if (val)
return val;
- return value_new_string_nocopy (str);
+
+ return value_new_string (str);
}
static GnmExprTop const *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]