From 8c1d2d318a5b3b5746a5ccac56d9e4512e5e588d Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Fri, 15 Sep 2017 16:42:04 +0200 Subject: [PATCH] More constness in C variables Use 'const' where possible, to avoid accidentally changing read-only variables. --- augeas-c.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/augeas-c.c b/augeas-c.c index 3952910..f4396cb 100644 --- a/augeas-c.c +++ b/augeas-c.c @@ -102,7 +102,7 @@ raise_init_error (const char *msg) } /* Map OCaml flags to C flags. */ -static int flag_map[] = { +static const int flag_map[] = { /* AugSaveBackup */ AUG_SAVE_BACKUP, /* AugSaveNewFile */ AUG_SAVE_NEWFILE, /* AugTypeCheck */ AUG_TYPE_CHECK, @@ -154,8 +154,8 @@ CAMLprim value ocaml_augeas_create (value rootv, value loadpathv, value flagsv) { CAMLparam1 (rootv); - char *root = String_val (rootv); - char *loadpath; + const char *root = String_val (rootv); + const char *loadpath; int flags = 0, i; augeas_t t; @@ -201,7 +201,7 @@ ocaml_augeas_get (value tv, value pathv) CAMLparam2 (tv, pathv); CAMLlocal2 (optv, v); augeas_t t = Augeas_t_val (tv); - char *path = String_val (pathv); + const char *path = String_val (pathv); const char *val; int r; @@ -227,7 +227,7 @@ ocaml_augeas_exists (value tv, value pathv) CAMLparam2 (tv, pathv); CAMLlocal1 (v); augeas_t t = Augeas_t_val (tv); - char *path = String_val (pathv); + const char *path = String_val (pathv); int r; r = aug_get (t, path, NULL); @@ -249,8 +249,8 @@ ocaml_augeas_insert (value tv, value beforev, value pathv, value labelv) { CAMLparam4 (tv, beforev, pathv, labelv); augeas_t t = Augeas_t_val (tv); - char *path = String_val (pathv); - char *label = String_val (labelv); + const char *path = String_val (pathv); + const char *label = String_val (labelv); int before; before = beforev == Val_int (0) ? 0 : Int_val (Field (beforev, 0)); @@ -267,7 +267,7 @@ ocaml_augeas_rm (value tv, value pathv) { CAMLparam2 (tv, pathv); augeas_t t = Augeas_t_val (tv); - char *path = String_val (pathv); + const char *path = String_val (pathv); int r; r = aug_rm (t, path); @@ -284,7 +284,7 @@ ocaml_augeas_match (value tv, value pathv) CAMLparam2 (tv, pathv); CAMLlocal3 (rv, v, cons); augeas_t t = Augeas_t_val (tv); - char *path = String_val (pathv); + const char *path = String_val (pathv); char **matches; int r, i; @@ -314,7 +314,7 @@ ocaml_augeas_count_matches (value tv, value pathv) { CAMLparam2 (tv, pathv); augeas_t t = Augeas_t_val (tv); - char *path = String_val (pathv); + const char *path = String_val (pathv); int r; r = aug_match (t, path, NULL); -- 1.8.3.1