projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of our own int32 type in favor of the standard int32_t type.
[pspp-builds.git]
/
src
/
data
/
sys-file-writer.c
diff --git
a/src/data/sys-file-writer.c
b/src/data/sys-file-writer.c
index 8abf052e47c3b2c6e4705d19b71292f0f352a879..21b06139fe00e39a3d12ec32a22585765708962f 100644
(file)
--- a/
src/data/sys-file-writer.c
+++ b/
src/data/sys-file-writer.c
@@
-217,8
+217,8
@@
sfm_open_writer (struct file_handle *fh, struct dictionary *d,
{
struct
{
{
struct
{
- int32 rec_type P;
- int32 filler P;
+ int32
_t
rec_type P;
+ int32
_t
filler P;
}
rec_999;
}
rec_999;
@@
-372,7
+372,7
@@
write_header (struct sfm_writer *w, const struct dictionary *d)
/* Translates format spec from internal form in SRC to system file
format in DEST. */
static inline void
/* Translates format spec from internal form in SRC to system file
format in DEST. */
static inline void
-write_format_spec (struct fmt_spec *src, int32 *dest)
+write_format_spec (struct fmt_spec *src, int32
_t
*dest)
{
*dest = (formats[src->type].spss << 16) | (src->w << 8) | src->d;
}
{
*dest = (formats[src->type].spss << 16) | (src->w << 8) | src->d;
}
@@
-425,7
+425,7
@@
write_variable (struct sfm_writer *w, struct variable *v)
{
struct label
{
{
struct label
{
- int32 label_len P;
+ int32
_t
label_len P;
char label[255] P;
}
l;
char label[255] P;
}
l;
@@
-468,16
+468,16
@@
write_value_labels (struct sfm_writer *w, struct variable *v, int idx)
{
struct value_label_rec
{
{
struct value_label_rec
{
- int32 rec_type P;
- int32 n_labels P;
+ int32
_t
rec_type P;
+ int32
_t
n_labels P;
flt64 labels[1] P;
};
struct var_idx_rec
{
flt64 labels[1] P;
};
struct var_idx_rec
{
- int32 rec_type P;
- int32 n_vars P;
- int32 vars[1] P;
+ int32
_t
rec_type P;
+ int32
_t
n_vars P;
+ int32
_t
vars[1] P;
};
struct val_labs_iterator *i;
};
struct val_labs_iterator *i;
@@
-530,8
+530,8
@@
write_documents (struct sfm_writer *w, const struct dictionary *d)
{
struct
{
{
struct
{
- int32
rec_type P;
/* Always 6. */
- int32
n_lines P;
/* Number of lines of documents. */
+ int32
_t rec_type P;
/* Always 6. */
+ int32
_t n_lines P;
/* Number of lines of documents. */
}
rec_6;
}
rec_6;
@@
-556,10
+556,10
@@
write_variable_display_parameters (struct sfm_writer *w,
struct
{
struct
{
- int32 rec_type P;
- int32 subtype P;
- int32 elem_size P;
- int32 n_elem P;
+ int32
_t
rec_type P;
+ int32
_t
subtype P;
+ int32
_t
elem_size P;
+ int32
_t
n_elem P;
} vdp_hdr;
vdp_hdr.rec_type = 7;
} vdp_hdr;
vdp_hdr.rec_type = 7;
@@
-574,9
+574,9
@@
write_variable_display_parameters (struct sfm_writer *w,
struct variable *v;
struct
{
struct variable *v;
struct
{
- int32 measure P;
- int32 width P;
- int32 align P;
+ int32
_t
measure P;
+ int32
_t
width P;
+ int32
_t
align P;
}
params;
}
params;
@@
-596,10
+596,10
@@
write_longvar_table (struct sfm_writer *w, const struct dictionary *dict)
{
struct
{
{
struct
{
- int32 rec_type P;
- int32 subtype P;
- int32 elem_size P;
- int32 n_elem P;
+ int32
_t
rec_type P;
+ int32
_t
subtype P;
+ int32
_t
elem_size P;
+ int32
_t
n_elem P;
}
lv_hdr;
}
lv_hdr;
@@
-633,15
+633,15
@@
write_rec_7_34 (struct sfm_writer *w)
{
struct
{
{
struct
{
- int32 rec_type_3 P;
- int32 subtype_3 P;
- int32 data_type_3 P;
- int32 n_elem_3 P;
- int32 elem_3[8] P;
- int32 rec_type_4 P;
- int32 subtype_4 P;
- int32 data_type_4 P;
- int32 n_elem_4 P;
+ int32
_t
rec_type_3 P;
+ int32
_t
subtype_3 P;
+ int32
_t
data_type_3 P;
+ int32
_t
n_elem_3 P;
+ int32
_t
elem_3[8] P;
+ int32
_t
rec_type_4 P;
+ int32
_t
subtype_4 P;
+ int32
_t
data_type_4 P;
+ int32
_t
n_elem_4 P;
flt64 elem_4[3] P;
}
rec_7;
flt64 elem_4[3] P;
}
rec_7;
@@
-664,7
+664,7
@@
write_rec_7_34 (struct sfm_writer *w)
rec_7.rec_type_3 = 7;
rec_7.subtype_3 = 3;
rec_7.rec_type_3 = 7;
rec_7.subtype_3 = 3;
- rec_7.data_type_3 = sizeof (int32);
+ rec_7.data_type_3 = sizeof (int32
_t
);
rec_7.n_elem_3 = 8;
rec_7.elem_3[0] = version_component[0];
rec_7.elem_3[1] = version_component[1];
rec_7.n_elem_3 = 8;
rec_7.elem_3[0] = version_component[0];
rec_7.elem_3[1] = version_component[1];
@@
-885,7
+885,7
@@
sfm_close_writer (struct sfm_writer *w)
if (ok && !fseek (w->file, offsetof (struct sysfile_header, case_cnt),
SEEK_SET))
{
if (ok && !fseek (w->file, offsetof (struct sysfile_header, case_cnt),
SEEK_SET))
{
- int32 case_cnt = w->case_cnt;
+ int32
_t
case_cnt = w->case_cnt;
fwrite (&case_cnt, sizeof case_cnt, 1, w->file);
clearerr (w->file);
}
fwrite (&case_cnt, sizeof case_cnt, 1, w->file);
clearerr (w->file);
}