projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added naive callbacks for the "value-changed" signal
[pspp]
/
src
/
data
/
data-in.c
diff --git
a/src/data/data-in.c
b/src/data/data-in.c
index 14a24fffe26d367497e9262fd9daa1a0709a68c0..ace167090c57b9f2f2fe97a4d4e96cd80405764d 100644
(file)
--- a/
src/data/data-in.c
+++ b/
src/data/data-in.c
@@
-281,7
+281,6
@@
parse_number (struct data_in *i)
struct string tmp;
struct string tmp;
- bool explicit_decimals = false;
int save_errno;
char *tail;
int save_errno;
char *tail;
@@
-334,7
+333,6
@@
parse_number (struct data_in *i)
/* Decimal point and following digits. */
if (ss_match_byte (&i->input, style->decimal))
{
/* Decimal point and following digits. */
if (ss_match_byte (&i->input, style->decimal))
{
- explicit_decimals = true;
ds_put_byte (&tmp, '.');
while (c_isdigit (ss_first (i->input)))
ds_put_byte (&tmp, ss_get_byte (&i->input));
ds_put_byte (&tmp, '.');
while (c_isdigit (ss_first (i->input)))
ds_put_byte (&tmp, ss_get_byte (&i->input));
@@
-345,7
+343,6
@@
parse_number (struct data_in *i)
&& !ss_is_empty (i->input)
&& strchr ("eEdD-+", ss_first (i->input)))
{
&& !ss_is_empty (i->input)
&& strchr ("eEdD-+", ss_first (i->input)))
{
- explicit_decimals = true;
ds_put_byte (&tmp, 'e');
if (strchr ("eEdD", ss_first (i->input)))
ds_put_byte (&tmp, 'e');
if (strchr ("eEdD", ss_first (i->input)))
@@
-922,7
+919,7
@@
parse_year (struct data_in *i, long *year, size_t max_digits)
else
*year += epoch_century + 100;
}
else
*year += epoch_century + 100;
}
- if (*year >= 1582
||
*year <= 19999)
+ if (*year >= 1582
&&
*year <= 19999)
return NULL;
return xasprintf (_("Year (%ld) must be between 1582 and 19999."), *year);
return NULL;
return xasprintf (_("Year (%ld) must be between 1582 and 19999."), *year);
@@
-1047,7
+1044,7
@@
parse_minute_second (struct data_in *i, double *time)
*cp++ = ss_get_byte (&i->input);
*cp = '\0';
*cp++ = ss_get_byte (&i->input);
*cp = '\0';
- *time += strtod (buf, NULL);
+ *time +=
c_
strtod (buf, NULL);
return NULL;
}
return NULL;
}