projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove property settings from psppire_data_window and put them into the GtkBuilder...
[pspp]
/
src
/
language
/
data-io
/
combine-files.c
diff --git
a/src/language/data-io/combine-files.c
b/src/language/data-io/combine-files.c
index d4b9bf58905cde762b12510d4506f797630918cb..fd57beced05ff7f45630294b802baf7aa9daf325 100644
(file)
--- a/
src/language/data-io/combine-files.c
+++ b/
src/language/data-io/combine-files.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 2009
, 2010
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
@@
-562,7
+562,7
@@
merge_dictionary (struct dictionary *const m, struct comb_file *f)
ds_put_format (&s, _("In an earlier file, %s was a string "
"variable with width %d."),
var_name, var_get_width (mv));
ds_put_format (&s, _("In an earlier file, %s was a string "
"variable with width %d."),
var_name, var_get_width (mv));
- msg (SE, ds_cstr (&s));
+ msg (SE,
"%s",
ds_cstr (&s));
ds_destroy (&s);
return false;
}
ds_destroy (&s);
return false;
}
@@
-575,7
+575,7
@@
merge_dictionary (struct dictionary *const m, struct comb_file *f)
var_set_label (mv, var_get_label (dv));
}
else
var_set_label (mv, var_get_label (dv));
}
else
- mv = dict_clone_var_assert (m, dv
, var_get_name (dv)
);
+ mv = dict_clone_var_assert (m, dv);
}
return true;
}
return true;