Merge branch 'rightlib' into mergelibs-241019-1758

1 files changed, 27 insertions, 27 deletions

diff --git a/contrib/libs/c-ares/src/lib/event/ares_event_configchg.c b/contrib/libs/c-ares/src/lib/event/ares_event_configchg.c
index 10f0e21dde..e3e665bd16 100644
--- a/contrib/libs/c-ares/src/lib/event/ares_event_configchg.c
+++ b/contrib/libs/c-ares/src/lib/event/ares_event_configchg.c
@@ -116,8 +116,8 @@ static void ares_event_configchg_cb(ares_event_thread_t *e, ares_socket_t fd,
         continue;
       }
 
-      if (strcasecmp(event->name, "resolv.conf") == 0 ||
-          strcasecmp(event->name, "nsswitch.conf") == 0) {
+      if (ares_strcaseeq(event->name, "resolv.conf") ||
+          ares_strcaseeq(event->name, "nsswitch.conf")) {
         triggered = ARES_TRUE;
       }
     }
@@ -545,17 +545,17 @@ typedef struct {
 } fileinfo_t;
 
 struct ares_event_configchg {
-  ares_bool_t           isup;
-  ares__thread_t       *thread;
-  ares__htable_strvp_t *filestat;
-  ares__thread_mutex_t *lock;
-  ares__thread_cond_t  *wake;
-  const char           *resolvconf_path;
-  ares_event_thread_t  *e;
+  ares_bool_t          isup;
+  ares_thread_t       *thread;
+  ares_htable_strvp_t *filestat;
+  ares_thread_mutex_t *lock;
+  ares_thread_cond_t  *wake;
+  const char          *resolvconf_path;
+  ares_event_thread_t *e;
 };
 
-static ares_status_t config_change_check(ares__htable_strvp_t *filestat,
-                                         const char           *resolvconf_path)
+static ares_status_t config_change_check(ares_htable_strvp_t *filestat,
+                                         const char          *resolvconf_path)
 {
   size_t      i;
   const char *configfiles[5];
@@ -568,7 +568,7 @@ static ares_status_t config_change_check(ares__htable_strvp_t *filestat,
   configfiles[4] = NULL;
 
   for (i = 0; configfiles[i] != NULL; i++) {
-    fileinfo_t *fi = ares__htable_strvp_get_direct(filestat, configfiles[i]);
+    fileinfo_t *fi = ares_htable_strvp_get_direct(filestat, configfiles[i]);
     struct stat st;
 
     if (stat(configfiles[i], &st) == 0) {
@@ -577,7 +577,7 @@ static ares_status_t config_change_check(ares__htable_strvp_t *filestat,
         if (fi == NULL) {
           return ARES_ENOMEM;
         }
-        if (!ares__htable_strvp_insert(filestat, configfiles[i], fi)) {
+        if (!ares_htable_strvp_insert(filestat, configfiles[i], fi)) {
           ares_free(fi);
           return ARES_ENOMEM;
         }
@@ -589,7 +589,7 @@ static ares_status_t config_change_check(ares__htable_strvp_t *filestat,
       fi->mtime = (time_t)st.st_mtime;
     } else if (fi != NULL) {
       /* File no longer exists, remove */
-      ares__htable_strvp_remove(filestat, configfiles[i]);
+      ares_htable_strvp_remove(filestat, configfiles[i]);
       changed = ARES_TRUE;
     }
   }
@@ -604,11 +604,11 @@ static void *ares_event_configchg_thread(void *arg)
 {
   ares_event_configchg_t *c = arg;
 
-  ares__thread_mutex_lock(c->lock);
+  ares_thread_mutex_lock(c->lock);
   while (c->isup) {
     ares_status_t status;
 
-    if (ares__thread_cond_timedwait(c->wake, c->lock, 30000) != ARES_ETIMEOUT) {
+    if (ares_thread_cond_timedwait(c->wake, c->lock, 30000) != ARES_ETIMEOUT) {
       continue;
     }
 
@@ -623,7 +623,7 @@ static void *ares_event_configchg_thread(void *arg)
     }
   }
 
-  ares__thread_mutex_unlock(c->lock);
+  ares_thread_mutex_unlock(c->lock);
   return NULL;
 }
 
@@ -643,13 +643,13 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
 
   c->e = e;
 
-  c->filestat = ares__htable_strvp_create(ares_free);
+  c->filestat = ares_htable_strvp_create(ares_free);
   if (c->filestat == NULL) {
     status = ARES_ENOMEM;
     goto done;
   }
 
-  c->wake = ares__thread_cond_create();
+  c->wake = ares_thread_cond_create();
   if (c->wake == NULL) {
     status = ARES_ENOMEM;
     goto done;
@@ -666,7 +666,7 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
   }
 
   c->isup = ARES_TRUE;
-  status  = ares__thread_create(&c->thread, ares_event_configchg_thread, c);
+  status  = ares_thread_create(&c->thread, ares_event_configchg_thread, c);
 
 done:
   if (status != ARES_SUCCESS) {
@@ -684,26 +684,26 @@ void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
   }
 
   if (configchg->lock) {
-    ares__thread_mutex_lock(configchg->lock);
+    ares_thread_mutex_lock(configchg->lock);
   }
 
   configchg->isup = ARES_FALSE;
   if (configchg->wake) {
-    ares__thread_cond_signal(configchg->wake);
+    ares_thread_cond_signal(configchg->wake);
   }
 
   if (configchg->lock) {
-    ares__thread_mutex_unlock(configchg->lock);
+    ares_thread_mutex_unlock(configchg->lock);
   }
 
   if (configchg->thread) {
     void *rv = NULL;
-    ares__thread_join(configchg->thread, &rv);
+    ares_thread_join(configchg->thread, &rv);
   }
 
-  ares__thread_mutex_destroy(configchg->lock);
-  ares__thread_cond_destroy(configchg->wake);
-  ares__htable_strvp_destroy(configchg->filestat);
+  ares_thread_mutex_destroy(configchg->lock);
+  ares_thread_cond_destroy(configchg->wake);
+  ares_htable_strvp_destroy(configchg->filestat);
   ares_free(configchg);
 }