projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not use const in pspp_linreg_get_vars. Use correct covariance
[pspp-builds.git]
/
src
/
ui
/
gui
/
comments-dialog.c
diff --git
a/src/ui/gui/comments-dialog.c
b/src/ui/gui/comments-dialog.c
index b584c0b5c78b9b771017e3157a1396f6022a37e6..f1a4936e6de06e9df95abcff13966f09faa8705e 100644
(file)
--- a/
src/ui/gui/comments-dialog.c
+++ b/
src/ui/gui/comments-dialog.c
@@
-22,7
+22,7
@@
#include <language/syntax-string-source.h>
#include "syntax-editor.h"
#include "psppire-var-store.h"
#include <language/syntax-string-source.h>
#include "syntax-editor.h"
#include "psppire-var-store.h"
-#include <
libpspp
/syntax-gen.h>
+#include <
ui
/syntax-gen.h>
#include "comments-dialog.h"
#include "comments-dialog.h"
@@
-244,27
+244,27
@@
generate_syntax (const struct comment_dialog *cd)
for (i = 0 ; i < gtk_text_buffer_get_line_count (buffer) ; ++i )
{
for (i = 0 ; i < gtk_text_buffer_get_line_count (buffer) ; ++i )
{
- struct string line;
- GtkTextIter start, end;
- gtk_text_buffer_get_iter_at_line (buffer, &start, i);
-
- end = start;
+ struct string tmp;
+ GtkTextIter start;
+ char *line;
- gtk_text_iter_forward_to_line_end (&end);
-
- if ( gtk_text_iter_ends_line (&start))
- ds_init_cstr (&line, "");
+ gtk_text_buffer_get_iter_at_line (buffer, &start, i);
+ if (gtk_text_iter_ends_line (&start))
+ line = g_strdup ("");
else
else
- ds_init_cstr (&line,
- gtk_text_buffer_get_text (buffer,
- &start, &end,
- FALSE));
+ {
+ GtkTextIter end = start;
+ gtk_text_iter_forward_to_line_end (&end);
+ line = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+ }
- gen_quoted_string (&line);
+ ds_init_empty (&tmp);
+ syntax_gen_string (&tmp, ss_cstr (line));
+ g_free (line);
- g_string_append_printf (str, " %s\n", ds_cstr (&
line
));
+ g_string_append_printf (str, " %s\n", ds_cstr (&
tmp
));
- ds_destroy (&
line
);
+ ds_destroy (&
tmp
);
}
g_string_append (str, " .\n");
}
g_string_append (str, " .\n");