diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2015-11-19 15:01:26 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-11-19 15:01:49 -0800 |
commit | 92949781eb0963fd1b25f1eec4e2d72d2c8ae32e (patch) | |
tree | 17f16cb6afb54afcbf6abc0ae2c54fe844454cb8 /modules/mod-test | |
parent | d9b300af5c7b07bd870046e73df53e19e860fdb9 (diff) | |
download | emacs-92949781eb0963fd1b25f1eec4e2d72d2c8ae32e.tar.gz |
Prefer signed integer types in module code
Generally speaking, at the C level the Emacs source code prefers
signed types like ‘ptrdiff_t’ to unsigned types like ‘size_t’,
partly to avoid the usual signedness confusion when comparing values.
Change the module API to follow this convention.
Use ‘int’ for small values that can’t exceed INT_MAX.
* modules/mod-test/mod-test.c (Fmod_test_globref_make)
(Fmod_test_string_a_to_b, Fmod_test_vector_fill)
(Fmod_test_vector_eq):
* src/emacs-module.c (struct emacs_value_frame)
(module_make_global_ref, module_free_global_ref)
(module_copy_string_contents, module_make_string)
(module_vec_set, module_vec_get, module_vec_size):
* src/emacs-module.h (struct emacs_runtime, struct emacs_env_25):
* src/lread.c (suffix_p):
Prefer signed to unsigned integer types.
Diffstat (limited to 'modules/mod-test')
-rw-r--r-- | modules/mod-test/mod-test.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/mod-test/mod-test.c b/modules/mod-test/mod-test.c index d1a4ce0d6fa..0160da69d0f 100644 --- a/modules/mod-test/mod-test.c +++ b/modules/mod-test/mod-test.c @@ -117,7 +117,7 @@ Fmod_test_globref_make (emacs_env *env, int nargs, emacs_value args[], { /* Make a big string and make it global. */ char str[26 * 100]; - for (size_t i = 0; i < sizeof str; i++) + for (int i = 0; i < sizeof str; i++) str[i] = 'a' + (i % 26); /* We don't need to null-terminate str. */ @@ -133,14 +133,14 @@ Fmod_test_string_a_to_b (emacs_env *env, int nargs, emacs_value args[], void *data) { emacs_value lisp_str = args[0]; - size_t size = 0; + ptrdiff_t size = 0; char * buf = NULL; env->copy_string_contents (env, lisp_str, buf, &size); buf = malloc (size); env->copy_string_contents (env, lisp_str, buf, &size); - for (size_t i = 0; i + 1 < size; i++) + for (ptrdiff_t i = 0; i + 1 < size; i++) if (buf[i] == 'a') buf[i] = 'b'; @@ -191,8 +191,8 @@ Fmod_test_vector_fill (emacs_env *env, int nargs, emacs_value args[], void *data { emacs_value vec = args[0]; emacs_value val = args[1]; - size_t size = env->vec_size (env, vec); - for (size_t i = 0; i < size; i++) + ptrdiff_t size = env->vec_size (env, vec); + for (ptrdiff_t i = 0; i < size; i++) env->vec_set (env, vec, i, val); return env->intern (env, "t"); } @@ -205,8 +205,8 @@ Fmod_test_vector_eq (emacs_env *env, int nargs, emacs_value args[], void *data) { emacs_value vec = args[0]; emacs_value val = args[1]; - size_t size = env->vec_size (env, vec); - for (size_t i = 0; i < size; i++) + ptrdiff_t size = env->vec_size (env, vec); + for (ptrdiff_t i = 0; i < size; i++) if (!env->eq (env, env->vec_get (env, vec, i), val)) return env->intern (env, "nil"); return env->intern (env, "t"); |