diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2017-01-15 21:42:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-15 21:42:51 +0000 |
| commit | e412b1998ec0071a5d55fe5f9decd2c4df18b122 (patch) | |
| tree | 71069efde3831f9a97468154a47e89728225b116 | |
| parent | fb3f120bf53492e70d25565f4b75495e42e0c747 (diff) | |
| parent | 06832cb0b98d83d257e6e006b9350cf3c4c9ef68 (diff) | |
| download | enchant-e412b1998ec0071a5d55fe5f9decd2c4df18b122.tar.gz | |
Merge pull request #50 from rrthomas/master
Various minor improvements, mostly cosmetic
| -rw-r--r-- | src/enchant.c | 15 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | unittests/EnchantBrokerTestFixture.h | 6 |
3 files changed, 8 insertions, 15 deletions
diff --git a/src/enchant.c b/src/enchant.c index aad2df8..cd0845d 100644 --- a/src/enchant.c +++ b/src/enchant.c @@ -372,7 +372,7 @@ enchant_fopen (const gchar *filename, const gchar *mode) } /** - * enchant_get_user_config_dir + * enchant_get_user_config_dirs * * Returns: the user's enchant directory, or %null. Returned value * must be free'd. @@ -591,10 +591,10 @@ enchant_session_destroy (EnchantSession * session) static EnchantSession * enchant_session_new_with_pwl (EnchantProvider * provider, - const char * const pwl, - const char * const excl, - const char * const lang, - gboolean fail_if_no_pwl) + const char * const pwl, + const char * const excl, + const char * const lang, + gboolean fail_if_no_pwl) { EnchantSession * session; EnchantPWL *personal = NULL; @@ -663,19 +663,18 @@ enchant_session_new (EnchantProvider *provider, const char * const lang) user_config_dirs = enchant_get_user_config_dirs (); for (iter = user_config_dirs; iter != NULL && session == NULL; iter = iter->next) { - session =_enchant_session_new (provider, iter->data, lang, TRUE); + session = _enchant_session_new (provider, iter->data, lang, TRUE); } if (session == NULL && user_config_dirs != NULL) { _enchant_ensure_dir_exists (user_config_dirs->data); - session =_enchant_session_new (provider, user_config_dirs->data, lang, FALSE); + session = _enchant_session_new (provider, user_config_dirs->data, lang, FALSE); } g_slist_foreach (user_config_dirs, (GFunc)g_free, NULL); g_slist_free (user_config_dirs); - return session; } diff --git a/tests/Makefile.am b/tests/Makefile.am index e2556ae..8088cd0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -39,7 +39,7 @@ enchantxx_test_LDADD = $(ldadd) enchant_lsmod_SOURCES = enchant-lsmod.c enchant_lsmod_LDADD = $(ldadd) -TESTS = $(noinst_PROGRAMS) +TESTS = $(check_PROGRAMS) # Enforce serial running of tests, so they don't contend for test.pwl enchantxx.log: enchant.log diff --git a/unittests/EnchantBrokerTestFixture.h b/unittests/EnchantBrokerTestFixture.h index dbfda60..1424ac0 100644 --- a/unittests/EnchantBrokerTestFixture.h +++ b/unittests/EnchantBrokerTestFixture.h @@ -35,12 +35,6 @@ #include <stdio.h>
#include <direct.h>
-#if !defined(_WIN32)
-#if !defined(O_BINARY)
-#define O_BINARY 0 // Posix systems don'd distinguish between text and binary so define O_BINARY for compatibility
-#endif
-#endif
-
//////////////////////////////////////
// Mock provider functions
static void
|