projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix issue reported on macos where the toolbar icons were not displayed.
[pspp]
/
src
/
language
/
control
/
repeat.c
diff --git
a/src/language/control/repeat.c
b/src/language/control/repeat.c
index fb790a3242b0a1ba296f9111b676b014d90d2236..c2e136cf41af10762d5e8719e07593f28a4d006e 100644
(file)
--- a/
src/language/control/repeat.c
+++ b/
src/language/control/repeat.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2007, 2009-201
1
Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2007, 2009-201
2
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-30,8
+30,10
@@
#include "libpspp/cast.h"
#include "libpspp/hash-functions.h"
#include "libpspp/hmap.h"
#include "libpspp/cast.h"
#include "libpspp/hash-functions.h"
#include "libpspp/hmap.h"
+#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/str.h"
#include "libpspp/message.h"
#include "libpspp/str.h"
+#include "libpspp/misc.h"
#include "gl/ftoastr.h"
#include "gl/minmax.h"
#include "gl/ftoastr.h"
#include "gl/minmax.h"
@@
-77,7
+79,7
@@
cmd_do_repeat (struct lexer *lexer, struct dataset *ds)
static unsigned int
hash_dummy (const char *name, size_t name_len)
{
static unsigned int
hash_dummy (const char *name, size_t name_len)
{
- return hash_case_bytes (name, name_len, 0);
+ return
utf8_
hash_case_bytes (name, name_len, 0);
}
static const struct dummy_var *
}
static const struct dummy_var *
@@
-87,7
+89,7
@@
find_dummy_var (struct hmap *hmap, const char *name, size_t name_len)
HMAP_FOR_EACH_WITH_HASH (dv, struct dummy_var, hmap_node,
hash_dummy (name, name_len), hmap)
HMAP_FOR_EACH_WITH_HASH (dv, struct dummy_var, hmap_node,
hash_dummy (name, name_len), hmap)
- if (strcasecmp (dv->name, name))
+ if (
utf8_
strcasecmp (dv->name, name))
return dv;
return NULL;
return dv;
return NULL;
@@
-249,7
+251,6
@@
parse_commands (struct lexer *lexer, struct hmap *dummies)
enum segmenter_mode mode;
struct string *outputs;
struct string input;
enum segmenter_mode mode;
struct string *outputs;
struct string input;
- size_t input_len;
size_t n_values;
char *file_name;
int line_number;
size_t n_values;
char *file_name;
int line_number;
@@
-272,7
+273,6
@@
parse_commands (struct lexer *lexer, struct hmap *dummies)
if (ds_is_empty (&input))
ds_put_byte (&input, '\n');
ds_put_byte (&input, '\0');
if (ds_is_empty (&input))
ds_put_byte (&input, '\n');
ds_put_byte (&input, '\0');
- input_len = ds_length (&input);
n_values = count_values (dummies);
outputs = xmalloc (n_values * sizeof *outputs);
n_values = count_values (dummies);
outputs = xmalloc (n_values * sizeof *outputs);
@@
-313,6
+313,7
@@
parse_commands (struct lexer *lexer, struct hmap *dummies)
lex_include (lexer, reader);
}
free (file_name);
lex_include (lexer, reader);
}
free (file_name);
+ free (outputs);
return ok;
}
return ok;
}
@@
-400,7
+401,7
@@
parse_numbers (struct lexer *lexer, struct dummy_var *dv)
{
char s[DBL_BUFSIZE_BOUND];
{
char s[DBL_BUFSIZE_BOUND];
- dtoastr (s, sizeof s, 0, 0, lex_number (lexer));
+
c_
dtoastr (s, sizeof s, 0, 0, lex_number (lexer));
add_replacement (dv, xstrdup (s), &allocated);
lex_get (lexer);
}
add_replacement (dv, xstrdup (s), &allocated);
lex_get (lexer);
}
@@
-438,6
+439,6
@@
parse_strings (struct lexer *lexer, struct dummy_var *dv)
int
cmd_end_repeat (struct lexer *lexer UNUSED, struct dataset *ds UNUSED)
{
int
cmd_end_repeat (struct lexer *lexer UNUSED, struct dataset *ds UNUSED)
{
- msg (SE, _("No matching
DO REPEAT.")
);
+ msg (SE, _("No matching
%s."), "DO REPEAT"
);
return CMD_CASCADING_FAILURE;
}
return CMD_CASCADING_FAILURE;
}