From: Andrea Zagli <azagli@libero.it>
Date: Sat, 30 Jan 2016 15:14:45 +0000 (+0100)
Subject: Adjustments from deprecations and use of GLog instead of syslog.
X-Git-Tag: v0.1.0~3^2~20
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=59c9ee958bcad26d65eecbc21b8baaca425e322f;p=libzakcgi

Adjustments from deprecations and use of GLog instead of syslog.
---

diff --git a/src/main.c b/src/main.c
index 6ac4d7d..ee40f82 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,8 +25,6 @@
 #include <string.h>
 #include <locale.h>
 
-#include <syslog.h>
-
 #include <glib/gprintf.h>
 #include <gio/gunixinputstream.h>
 
@@ -359,7 +357,7 @@ GValue
 
 	ht = _zak_cgi_main_get_cookies (zakcgimain);
 
-	ret = g_hash_table_lookup (ht, cookie);
+	ret = (GValue *)g_hash_table_lookup (ht, cookie);
 
 	return ret;
 }
@@ -745,11 +743,11 @@ gchar
 					                         &error);
 					if (l != bytesread)
 						{
-							syslog (LOG_MAKEPRI(LOG_SYSLOG, LOG_DEBUG), "error reading stdin: bytes read differ from content length");
+							g_warning ("Error reading stdin: bytes read differ from content length");
 						}
 					if (error != NULL)
 						{
-							syslog (LOG_MAKEPRI(LOG_SYSLOG, LOG_DEBUG), "error reading stdin: %s", error->message);
+							g_warning ("Error reading stdin: %s", error->message);
 						}
 				}
 		}
diff --git a/src/session.c b/src/session.c
index 511ab3b..e10f1a0 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2015-2016 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,8 +20,6 @@
 	#include <config.h>
 #endif
 
-#include <syslog.h>
-
 #include <gio/gio.h>
 
 #include <string.h>
@@ -96,14 +94,13 @@ ZakCgiSession
 					  const gchar *base_uri,
 					  const gchar *path)
 {
-	GHashTable *ht_cookies;
-
 	GError *error;
+	gchar *val;
 
 	ZakCgiSession *zak_cgi_session;
 	ZakCgiSessionPrivate *priv;
 
-	gchar *val;
+	g_return_val_if_fail (ZAK_CGI_IS_MAIN (zakcgimain), NULL);
 
 	zak_cgi_session = ZAK_CGI_SESSION (g_object_new (zak_cgi_session_get_type (), NULL));
 
@@ -118,8 +115,7 @@ ZakCgiSession
 			priv->path = g_strdup (path);
 		}
 
-	ht_cookies = zak_cgi_main_get_cookies (priv->zakcgimain);
-	priv->sid = g_hash_table_lookup (ht_cookies, "ZAKCGISID");
+	priv->sid = g_strdup ((gchar *)g_value_get_string (zak_cgi_main_get_cookie (priv->zakcgimain, "ZAKCGISID")));
 
 	if (priv->sid != NULL)
 		{
@@ -219,8 +215,6 @@ gchar
 	guint32 i;
 	gchar *tmp;
 
-	GHashTable *ht_env;
-
 	ZakCgiSessionPrivate *priv = ZAK_CGI_SESSION_GET_PRIVATE (session);
 
 	if (priv->sid == NULL)
@@ -245,6 +239,8 @@ gchar
 			    || error != NULL)
 				{
 					/* TODO */
+					g_warning ("Unable to write new session file: %s.",
+							   error != NULL && error->message != NULL ? error->message : "no details");
 				}
 			else
 				{
@@ -259,6 +255,8 @@ gchar
 						|| error != NULL)
 						{
 							/* TODO */
+							g_warning ("Unable to read session file: %s.",
+									   error != NULL && error->message != NULL ? error->message : "no details");
 						}
 					else
 						{
@@ -275,10 +273,8 @@ gchar
 						}
 				}
 
-			ht_env = zak_cgi_main_get_env (priv->zakcgimain);
-
 			ret = zak_cgi_main_set_cookie ("ZAKCGISID", priv->sid, NULL, NULL,
-										   priv->base_uri != NULL ? priv->base_uri : (gchar *)g_hash_table_lookup (ht_env, "CONTEXT_PREFIX"),
+										   priv->base_uri != NULL ? priv->base_uri : (gchar *)g_value_get_string (zak_cgi_main_get_env_field (priv->zakcgimain, "CONTEXT_PREFIX")),
 										   FALSE, FALSE);
 		}
 	else
@@ -301,10 +297,19 @@ zak_cgi_session_set_value (ZakCgiSession *session, const gchar *name, const gcha
 {
 	ZakCgiSessionPrivate *priv = ZAK_CGI_SESSION_GET_PRIVATE (session);
 
+	GError *error;
+
 	if (priv->kfile != NULL)
 		{
 			g_key_file_set_value (priv->kfile, "SESSION", name, value);
-			g_key_file_save_to_file (priv->kfile, g_file_get_path (priv->gfile), NULL);
+
+			error = NULL;
+			if (!g_key_file_save_to_file (priv->kfile, g_file_get_path (priv->gfile), &error)
+				|| error != NULL)
+				{
+					g_warning ("Unable to write value tosession file: %s.",
+							   error != NULL && error->message != NULL ? error->message : "no details");
+				}
 		}
 }
 
diff --git a/tests/session.c b/tests/session.c
index ef18155..e2dec75 100644
--- a/tests/session.c
+++ b/tests/session.c
@@ -21,6 +21,17 @@
 #include <main.h>
 #include <session.h>
 
+void
+ht_foreach (gpointer key,
+			gpointer value,
+			gpointer user_data)
+{
+	GString *str = (GString *)user_data;
+
+	g_string_append_printf (str, "<tr><td>%s</td><td>%s</td></tr>\n",
+							(gchar *)key, g_value_get_string ((GValue *)value));
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -30,20 +41,27 @@ main (int argc, char *argv[])
 	GString *header;
 	GHashTable *ht;
 	GHashTable *ht_stdin;
+	ZakCgiMain *zakcgimain;
 	ZakCgiSession *session;
 
 	gchar *method;
 
-	session = zak_cgi_session_new (NULL, NULL, NULL);
+	zakcgimain = zak_cgi_main_new ();
+
+	session = zak_cgi_session_new (zakcgimain, NULL, NULL);
 
 	str = g_string_new ("<html>\n"
 	                    "<head><title>Session Cookie</title></head>\n"
 	                    "<body>\n");
 
-	ht = zak_cgi_main_get_env (NULL);
+	g_string_append_printf (str, "<table>\n");
+	zak_cgi_main_cookies_foreach (zakcgimain, ht_foreach, str);
+	g_string_append_printf (str, "</table>\n");
+
+	ht = zak_cgi_main_get_env (zakcgimain);
 	if (ht != NULL)
 		{
-			method = g_hash_table_lookup (ht, "REQUEST_METHOD");
+			method = g_value_get_string (g_hash_table_lookup (ht, "REQUEST_METHOD"));
 			if (g_strcmp0 (method, "POST") == 0)
 				{
 					const gchar *content_type = g_getenv ("CONTENT_TYPE");
@@ -52,7 +70,7 @@ main (int argc, char *argv[])
 						{
 							gchar **boundary = g_strsplit (splitted[1], "=", 2);
 
-							env = zak_cgi_main_get_stdin (NULL);
+							env = zak_cgi_main_get_stdin (zakcgimain);
 
 							ht_stdin = zak_cgi_main_parse_stdin (env, boundary[1]);