summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReuben Thomas <rrt@sc3d.org>2021-11-08 15:08:03 +0000
committerReuben Thomas <rrt@sc3d.org>2021-11-08 15:09:19 +0000
commit34eed0fbd502cc3980e7931dbdb4e9379b34252d (patch)
tree7236a0654ad13c95f756ec8db5a7fb9072b99062
parentb82bf88737c91465bd6fc1fe4a9e1f66b2e33852 (diff)
downloadenchant-34eed0fbd502cc3980e7931dbdb4e9379b34252d.tar.gz
enchant_provider_is_valid: do NULL checks in same order as fields are declared
-rw-r--r--src/lib.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib.c b/src/lib.c
index 4d91c7c..25eea4e 100644
--- a/src/lib.c
+++ b/src/lib.c
@@ -770,6 +770,12 @@ enchant_provider_is_valid(EnchantProvider * provider)
{
if (provider == NULL)
g_warning ("EnchantProvider cannot be NULL\n");
+ else if (provider->dispose == NULL)
+ g_warning ("EnchantProvider's dispose method cannot be NULL\n");
+ else if (provider->request_dict == NULL)
+ g_warning ("EnchantProvider's request_dict method cannot be NULL\n");
+ else if (provider->dispose_dict == NULL)
+ g_warning ("EnchantProvider's dispose_dict method cannot be NULL\n");
else if (provider->identify == NULL)
g_warning ("EnchantProvider's identify method cannot be NULL\n");
else if (!g_utf8_validate((*provider->identify)(provider), -1, NULL))
@@ -778,14 +784,8 @@ enchant_provider_is_valid(EnchantProvider * provider)
g_warning ("EnchantProvider's describe method cannot be NULL\n");
else if (!g_utf8_validate((*provider->describe)(provider), -1, NULL))
g_warning ("EnchantProvider's describe method does not return valid UTF-8\n");
- else if (provider->dispose == NULL)
- g_warning ("EnchantProvider's dispose method cannot be NULL\n");
- else if (provider->dispose_dict == NULL)
- g_warning ("EnchantProvider's dispose_dict method cannot be NULL\n");
else if (provider->list_dicts == NULL)
g_warning ("EnchantProvider's list_dicts method cannot be NULL\n");
- else if (provider->request_dict == NULL)
- g_warning ("EnchantProvider's request_dict method cannot be NULL\n");
else
return 1;