projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adopt use of gnulib for portability.
[pspp]
/
src
/
sysfile-info.c
diff --git
a/src/sysfile-info.c
b/src/sysfile-info.c
index 5c8f6a651c2759c82f7965d1c114e117dfb918f0..08d5484f70e0d285fd4b8317f7ec2379ca09bd35 100644
(file)
--- a/
src/sysfile-info.c
+++ b/
src/sysfile-info.c
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#include <config.h>
#include "error.h"
#include <config.h>
#include "error.h"
@@
-37,6
+37,9
@@
#include "value-labels.h"
#include "var.h"
#include "value-labels.h"
#include "var.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
/* Constants for DISPLAY utility. */
enum
{
/* Constants for DISPLAY utility. */
enum
{
@@
-49,7
+52,7
@@
enum
AS_VECTOR
};
AS_VECTOR
};
-int describe_variable (struct variable *v, struct tab_table *t, int r, int as);
+
static
int describe_variable (struct variable *v, struct tab_table *t, int r, int as);
/* Sets the widths of all the columns and heights of all the rows in
table T for driver D. */
/* Sets the widths of all the columns and heights of all the rows in
table T for driver D. */
@@
-128,6
+131,7
@@
cmd_sysfile_info (void)
tab_submit (t);
nr = 1 + 2 * dict_get_var_cnt (d);
tab_submit (t);
nr = 1 + 2 * dict_get_var_cnt (d);
+
t = tab_create (4, nr, 1);
tab_dim (t, sysfile_info_dim);
tab_headers (t, 0, 0, 1, 0);
t = tab_create (4, nr, 1);
tab_dim (t, sysfile_info_dim);
tab_headers (t, 0, 0, 1, 0);
@@
-138,7
+142,7
@@
cmd_sysfile_info (void)
for (r = 1, i = 0; i < dict_get_var_cnt (d); i++)
{
struct variable *v = dict_get_var (d, i);
for (r = 1, i = 0; i < dict_get_var_cnt (d); i++)
{
struct variable *v = dict_get_var (d, i);
- int nvl = val_labs_count (v->val_labs);
+
const
int nvl = val_labs_count (v->val_labs);
if (r + 10 + nvl > nr)
{
if (r + 10 + nvl > nr)
{
@@
-149,10
+153,11
@@
cmd_sysfile_info (void)
r = describe_variable (v, t, r, AS_DICTIONARY);
}
r = describe_variable (v, t, r, AS_DICTIONARY);
}
+
tab_box (t, TAL_1, TAL_1, -1, -1, 0, 0, 3, r);
tab_box (t, TAL_1, TAL_1, -1, -1, 0, 0, 3, r);
- tab_vline (t, TAL_1, 0, 0, r);
tab_vline (t, TAL_1, 1, 0, r);
tab_vline (t, TAL_1, 3, 0, r);
tab_vline (t, TAL_1, 1, 0, r);
tab_vline (t, TAL_1, 3, 0, r);
+
tab_resize (t, -1, r);
tab_flags (t, SOMF_NO_TITLE);
tab_submit (t);
tab_resize (t, -1, r);
tab_flags (t, SOMF_NO_TITLE);
tab_submit (t);
@@
-260,7
+265,7
@@
cmd_display (void)
}
if (sorted)
}
if (sorted)
- sort (vl, n, sizeof *vl, compare_var
iabl
es, NULL);
+ sort (vl, n, sizeof *vl, compare_var
_nam
es, NULL);
display_variables (vl, n, as);
display_variables (vl, n, as);
@@
-425,7
+430,7
@@
display_variables (struct variable **vl, int n, int as)
/* Puts a description of variable V into table T starting at row R.
The variable will be described in the format AS. Returns the next
row available for use in the table. */
/* Puts a description of variable V into table T starting at row R.
The variable will be described in the format AS. Returns the next
row available for use in the table. */
-int
+
static
int
describe_variable (struct variable *v, struct tab_table *t, int r, int as)
{
/* Put the name, var label, and position into the first row. */
describe_variable (struct variable *v, struct tab_table *t, int r, int as)
{
/* Put the name, var label, and position into the first row. */
@@
-569,7
+574,7
@@
compare_vectors_by_name (const void *a_, const void *b_)
struct vector *a = *pa;
struct vector *b = *pb;
struct vector *a = *pa;
struct vector *b = *pb;
- return strcmp (a->name, b->name);
+ return strc
asec
mp (a->name, b->name);
}
/* Display a list of vectors. If SORTED is nonzero then they are
}
/* Display a list of vectors. If SORTED is nonzero then they are
@@
-608,3
+613,14
@@
display_vectors (int sorted)
free (vl);
}
free (vl);
}
+
+
+
+
+
+
+
+
+
+
+