projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
subscript fixes; added free functions
[pspp]
/
src
/
language
/
utilities
/
title.c
diff --git
a/src/language/utilities/title.c
b/src/language/utilities/title.c
index 15e5a404983a1d85fa321b825691b52b927b993c..18e4bb2745068af5f6e156e8642b4d1f497ca070 100644
(file)
--- a/
src/language/utilities/title.c
+++ b/
src/language/utilities/title.c
@@
-18,24
+18,24
@@
02110-1301, USA. */
#include <config.h>
02110-1301, USA. */
#include <config.h>
+
#include <ctype.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
-#include <language/command.h>
+
#include <data/dictionary.h>
#include <data/dictionary.h>
-#include <libpspp/message.h>
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/lexer.h>
-#include <output/output.h>
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
#include <libpspp/start-date.h>
#include <libpspp/start-date.h>
-#include <data/variable.h>
#include <libpspp/version.h>
#include <libpspp/version.h>
-#include <
procedure
.h>
+#include <
output/output
.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
-#include <libpspp/debug-print.h>
-
static int get_title (const char *cmd, char **title);
int
static int get_title (const char *cmd, char **title);
int
@@
-56,7
+56,6
@@
get_title (const char *cmd, char **title)
int c;
c = lex_look_ahead ();
int c;
c = lex_look_ahead ();
- debug_printf ((_("%s before: %s\n"), cmd, *title ? *title : _("<none>")));
if (c == '"' || c == '\'')
{
lex_get ();
if (c == '"' || c == '\'')
{
lex_get ();
@@
-64,7
+63,7
@@
get_title (const char *cmd, char **title)
return CMD_FAILURE;
if (*title)
free (*title);
return CMD_FAILURE;
if (*title)
free (*title);
- *title =
xstrdup (ds_c_str (&tokstr)
);
+ *title =
ds_xstrdup (&tokstr
);
lex_get ();
if (token != '.')
{
lex_get ();
if (token != '.')
{
@@
-84,7
+83,6
@@
get_title (const char *cmd, char **title)
*cp = toupper ((unsigned char) (*cp));
token = '.';
}
*cp = toupper ((unsigned char) (*cp));
token = '.';
}
- debug_printf ((_("%s after: %s\n"), cmd, *title));
return CMD_SUCCESS;
}
return CMD_SUCCESS;
}