lib: convert notmuch decryption policy to an enum

[notmuch] / lib / indexopts.c

diff --git a/lib/indexopts.c b/lib/indexopts.c
index ca6bf6c962ccddbe37e595e4c1d630ef8b302bd8..78f533916f2a995f0da70df25ec42812caff4ef9 100644 (file)
--- a/lib/indexopts.c
+++ b/lib/indexopts.c
@@ -26,34 +26,35 @@ notmuch_database_get_default_indexopts (notmuch_database_t *db)
     notmuch_indexopts_t *ret = talloc_zero (db, notmuch_indexopts_t);
     if (!ret)
        return ret;
+    ret->crypto.decrypt = NOTMUCH_DECRYPT_FALSE;
 
-    char * decrypt;
-    notmuch_status_t err = notmuch_database_get_config (db, "index.decrypt", &decrypt);
+    char * decrypt_policy;
+    notmuch_status_t err = notmuch_database_get_config (db, "index.decrypt", &decrypt_policy);
     if (err)
        return ret;
 
-    if (decrypt &&
-       ((!(strcasecmp(decrypt, "true"))) ||
-        (!(strcasecmp(decrypt, "yes"))) ||
-        (!(strcasecmp(decrypt, "1")))))
-       notmuch_indexopts_set_try_decrypt (ret, true);
+    if (decrypt_policy &&
+       ((!(strcasecmp(decrypt_policy, "true"))) ||
+        (!(strcasecmp(decrypt_policy, "yes"))) ||
+        (!(strcasecmp(decrypt_policy, "1")))))
+       notmuch_indexopts_set_decrypt_policy (ret, NOTMUCH_DECRYPT_TRUE);
 
-    free (decrypt);
+    free (decrypt_policy);
     return ret;
 }
 
 notmuch_status_t
-notmuch_indexopts_set_try_decrypt (notmuch_indexopts_t *indexopts,
-                                  notmuch_bool_t try_decrypt)
+notmuch_indexopts_set_decrypt_policy (notmuch_indexopts_t *indexopts,
+                                     notmuch_decryption_policy_t decrypt_policy)
 {
     if (!indexopts)
        return NOTMUCH_STATUS_NULL_POINTER;
-    indexopts->crypto.decrypt = try_decrypt;
+    indexopts->crypto.decrypt = decrypt_policy;
     return NOTMUCH_STATUS_SUCCESS;
 }
 
-notmuch_bool_t
-notmuch_indexopts_get_try_decrypt (const notmuch_indexopts_t *indexopts)
+notmuch_decryption_policy_t
+notmuch_indexopts_get_decrypt_policy (const notmuch_indexopts_t *indexopts)
 {
     if (!indexopts)
        return false;