[RQ170516-00892] Fixed build warning

- [Backporting] GTlsConnection: avoid non-literal format string
  (https://bugzilla.gnome.org/show_bug.cgi?id)
- Replaced readdir_r() with readdir()

Change-Id: I36dea8e1c7c9d171caa9add39d05abe92556b7f9
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
index d4b1ea9..421dd82 100755 (executable)
--- a/tls/gnutls/gtlsconnection-gnutls.c
+++ b/tls/gnutls/gtlsconnection-gnutls.c
@@ -21,6 +21,7 @@
 #include "glib.h"
 
 #include <errno.h>
+#include <stdarg.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 
@@ -692,10 +693,19 @@ begin_gnutls_io (GTlsConnectionGnutls  *gnutls,
 
 static int
 end_gnutls_io (GTlsConnectionGnutls  *gnutls,
-              GIOCondition           direction,
-              int                    status,
-              const char            *errmsg,
-              GError               **error)
+               GIOCondition           direction,
+               int                    status,
+               GError               **error,
+               const char            *err_fmt,
+               ...) G_GNUC_PRINTF(5, 6);
+
+static int
+end_gnutls_io (GTlsConnectionGnutls  *gnutls,
+               GIOCondition           direction,
+               int                    status,
+               GError               **error,
+               const char            *err_fmt,
+               ...)
 {
   GError *my_error = NULL;
 
@@ -805,8 +815,11 @@ end_gnutls_io (GTlsConnectionGnutls  *gnutls,
 
   if (error)
     {
-      g_set_error (error, G_TLS_ERROR, G_TLS_ERROR_MISC,
-                   errmsg, gnutls_strerror (status));
+      va_list ap;
+
+      va_start (ap, err_fmt);
+      *error = g_error_new_valist (G_TLS_ERROR, G_TLS_ERROR_MISC, err_fmt, ap);
+      va_end (ap);
     }
   return status;
 }
@@ -816,7 +829,7 @@ end_gnutls_io (GTlsConnectionGnutls  *gnutls,
   do {
 
 #define END_GNUTLS_IO(gnutls, direction, ret, errmsg, err)             \
-  } while ((ret = end_gnutls_io (gnutls, direction, ret, errmsg, err)) == GNUTLS_E_AGAIN);
+  } while ((ret = end_gnutls_io (gnutls, direction, ret, err, errmsg, gnutls_strerror (ret))) == GNUTLS_E_AGAIN);
 
 gboolean
 g_tls_connection_gnutls_check (GTlsConnectionGnutls  *gnutls,

diff --git a/tls/gnutls/gtlsfiledatabase-gnutls.c b/tls/gnutls/gtlsfiledatabase-gnutls.c
index 71c9123..7871d0e 100755 (executable)
--- a/tls/gnutls/gtlsfiledatabase-gnutls.c
+++ b/tls/gnutls/gtlsfiledatabase-gnutls.c
@@ -274,18 +274,17 @@ traverse_load_anchor_file (const gchar *filename,
           result = load_anchor_file (filename, subjects, issuers, complete, error);
       else if (S_ISDIR(buf.st_mode))
         {
-          DIR* pDir = opendir(filename);
+          DIR *pDir = opendir(filename);
           if (pDir != NULL)
             {
-             struct dirent dent;
-              struct dirent* dentp;
+              struct dirent *dp;
               char *stFileName;
-              while (((readdir_r(pDir, &dent, &dentp)) == 0) && dentp)
+              while ((dp = readdir(pDir)) != NULL)
                 {
-                  if (!g_ascii_strcasecmp(dentp->d_name, ".") || !g_ascii_strcasecmp(dentp->d_name, ".."))
+                  if (!g_ascii_strcasecmp(dp->d_name, ".") || !g_ascii_strcasecmp(dp->d_name, ".."))
                       continue;
 
-                  stFileName = g_strconcat (filename, "/", dentp->d_name, NULL);
+                  stFileName = g_strconcat (filename, "/", dp->d_name, NULL);
                   if (stFileName && !stat(stFileName, &buf) && S_ISREG(buf.st_mode))
                       result = load_anchor_file (stFileName, subjects, issuers, complete, error);
                   g_free (stFileName);