* nis/nis_defaults.c (searchXYX): New functions. Used by both

[platform/upstream/glibc.git] / iconv / gconv_open.c

diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c
index 95f3203..bbf27b3 100644 (file)
--- a/iconv/gconv_open.c
+++ b/iconv/gconv_open.c
@@ -67,7 +67,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
          tok = __strtok_r (tok, ",", &ptr);
          while (tok != NULL)
            {
-             if (__strcasecmp_l (tok, "TRANSLIT", &_nl_C_locobj) == 0)
+             if (__strcasecmp_l (tok, "TRANSLIT", _nl_C_locobj_ptr) == 0)
                {
                  /* It's the builtin transliteration handling.  We only
                     support it for working on the internal encoding.  */
@@ -101,7 +101,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
                        lastp->next = newp;
                    }
                }
-             else if (__strcasecmp_l (tok, "IGNORE", &_nl_C_locobj) == 0)
+             else if (__strcasecmp_l (tok, "IGNORE", _nl_C_locobj_ptr) == 0)
                /* Set the flag to ignore all errors.  */
                conv_flags |= __GCONV_IGNORE_ERRORS;
              else
@@ -115,7 +115,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
                  for (runp = trans; runp != NULL; runp = runp->next)
                    if (runp->name != NULL
                        && __strcasecmp_l (tok, runp->name,
-                                          &_nl_C_locobj) == 0)
+                                          _nl_C_locobj_ptr) == 0)
                      break;
                    else
                      lastp = runp;
@@ -235,7 +235,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
              for (runp = trans; runp != NULL; runp = runp->next)
                for (n = 0; n < runp->ncsnames; ++n)
                  if (__strcasecmp_l (steps[cnt].__from_name,
-                                     runp->csnames[n], &_nl_C_locobj) == 0)
+                                     runp->csnames[n], _nl_C_locobj_ptr) == 0)
                    {
                      void *data = NULL;