projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
format: Create a new "struct fmt_affix" for prefix and suffix strings.
[pspp-builds.git]
/
src
/
language
/
utilities
/
set.q
diff --git
a/src/language/utilities/set.q
b/src/language/utilities/set.q
index 5fa7406164bcbe921312a34ce372ff629956c7d8..552747066740c53f3111b5521e1a96dafa4a9202 100644
(file)
--- a/
src/language/utilities/set.q
+++ b/
src/language/utilities/set.q
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010
, 2011
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
@@
-536,11
+536,11
@@
show_blanks (const struct dataset *ds UNUSED)
}
static void
}
static void
-format_cc (struct string *out,
struct substring
in, char grouping)
+format_cc (struct string *out,
const char *
in, char grouping)
{
{
- while (
!ss_is_empty (in)
)
+ while (
*in != '\0'
)
{
{
- char c =
ss_get_byte (&in)
;
+ char c =
*in++
;
if (c == grouping || c == '\'')
ds_put_byte (out, '\'');
else if (c == '"')
if (c == grouping || c == '\'')
ds_put_byte (out, '\'');
else if (c == '"')
@@
-556,13
+556,13
@@
show_cc (enum fmt_type type)
struct string out;
ds_init_empty (&out);
struct string out;
ds_init_empty (&out);
- format_cc (&out, cc->neg_prefix, cc->grouping);
+ format_cc (&out, cc->neg_prefix
.s
, cc->grouping);
ds_put_byte (&out, cc->grouping);
ds_put_byte (&out, cc->grouping);
- format_cc (&out, cc->prefix, cc->grouping);
+ format_cc (&out, cc->prefix
.s
, cc->grouping);
ds_put_byte (&out, cc->grouping);
ds_put_byte (&out, cc->grouping);
- format_cc (&out, cc->suffix, cc->grouping);
+ format_cc (&out, cc->suffix
.s
, cc->grouping);
ds_put_byte (&out, cc->grouping);
ds_put_byte (&out, cc->grouping);
- format_cc (&out, cc->neg_suffix, cc->grouping);
+ format_cc (&out, cc->neg_suffix
.s
, cc->grouping);
return ds_cstr (&out);
}
return ds_cstr (&out);
}