Mercurial > pidgin.yaz

changeset 13362:f33077f19b60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 15735] TZ abbreviation mapping: - Change a couple NULL returns to the empty string, so things don't blow up. - Cache the lookup value for a standard comparison. By copying the value to the front of the array, we'll save a lot of unnecessary string comparisons. - Add newlines to the end of all the debug statements - Disable the debugging statements for normal cases, as this code is pretty solid I'd love it if someone running Windows could verify their newly created log files still have a TZ abbreviation in the name after these changes. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Wed, 01 Mar 2006 06:57:54 +0000
parents 9b4a80566fd5
children ef5287de40b5
files src/win32/libc_interface.c
diffstat 1 files changed, 40 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/src/win32/libc_interface.c	Wed Mar 01 06:42:39 2006 +0000
+++ b/src/win32/libc_interface.c	Wed Mar 01 06:57:54 2006 +0000
@@ -812,25 +812,44 @@
 
 	if (!tm)
 	{
-		gaim_debug_warning("wgaim", "could not determine current date/time: localtime failed");
-		return NULL;
+		gaim_debug_warning("wgaim", "could not determine current date/time: localtime failed\n");
+		return "";
 	}
 
-	memset(tzname, 0, sizeof(tzname));
-	strftime(tzname, sizeof(tzname) - 1, "%Z", tm);
+	if (strftime(tzname, sizeof(tzname) - 1, "%Z", tm) == 0)
+	{
+		gaim_debug_error("wgaim", "timezone name is too long for the buffer\n");
+		return "";
+	}
 
 	for (i = 0; win32_tzmap[i].wstd != NULL; i++)
 	{
 		if (strcmp(tzname, win32_tzmap[i].wstd) == 0)
 		{
-			gaim_debug_info("wgaim", "TZ \"%s\" matches Windows timezone \"%s\"",
+#if 0
+			gaim_debug_info("wgaim", "TZ \"%s\" matches Windows timezone \"%s\"\n",
 			                win32_tzmap[i].ustd, tzname);
+#endif
+			/* Cache the Result */
+			if (win32_tzmap[0].wstd[0] != '\0')
+				g_free(win32_tzmap[0].wstd);
+			win32_tzmap[0].wstd = g_strdup(tzname);
+			win32_tzmap[0].ustd = win32_tzmap[i].ustd;
+
 			return win32_tzmap[i].ustd;
 		}
 		if (strcmp(tzname, win32_tzmap[i].wdst) == 0)
 		{
-			gaim_debug_info("wgaim", "TZ \"%s\" matches Windows timezone \"%s\"",
+#if 0
+			gaim_debug_info("wgaim", "TZ \"%s\" matches Windows timezone \"%s\"\n",
 			                win32_tzmap[i].udst, tzname);
+#endif
+			/* Cache the Result */
+			if (win32_tzmap[0].wdst[0] != '\0')
+				g_free(win32_tzmap[0].wdst);
+			win32_tzmap[0].wdst = g_strdup(tzname);
+			win32_tzmap[0].udst = win32_tzmap[i].udst;
+
 			return win32_tzmap[i].udst;
 		}
 	}
@@ -847,8 +866,8 @@
 					 KEY_READ,
 					 &rootKey) != ERROR_SUCCESS)
 	{
-		gaim_debug_warning("wgaim", "could not open registry key to identify Windows timezone: %i", (int) GetLastError());
-		return NULL;
+		gaim_debug_warning("wgaim", "could not open registry key to identify Windows timezone: %i\n", (int) GetLastError());
+		return "";
 	}
 
 	for (idx = 0;; idx++)
@@ -873,13 +892,13 @@
 		{
 			if (r == ERROR_NO_MORE_ITEMS)
 				break;
-			gaim_debug_warning("wgaim", "could not enumerate registry subkeys to identify Windows timezone: %i", (int) r);
+			gaim_debug_warning("wgaim", "could not enumerate registry subkeys to identify Windows timezone: %i\n", (int) r);
 			break;
 		}
 
 		if ((r = RegOpenKeyEx(rootKey, keyname, 0, KEY_READ, &key)) != ERROR_SUCCESS)
 		{
-			gaim_debug_warning("wgaim", "could not open registry subkey to identify Windows timezone: %i", (int) r);
+			gaim_debug_warning("wgaim", "could not open registry subkey to identify Windows timezone: %i\n", (int) r);
 			break;
 		}
 
@@ -887,14 +906,14 @@
 		namesize = sizeof(zonename);
 		if ((r = RegQueryValueEx(key, "Std", NULL, NULL, zonename, &namesize)) != ERROR_SUCCESS)
 		{
-			gaim_debug_warning("wgaim", "could not query value for 'std' to identify Windows timezone: %i", (int) r);
+			gaim_debug_warning("wgaim", "could not query value for 'std' to identify Windows timezone: %i\n", (int) r);
 			RegCloseKey(key);
 			break;
 		}
 		if (strcmp(tzname, zonename) == 0)
 		{
 			/* Matched zone */
-			strcpy(localtzname, keyname);
+			gaim_strlcpy(localtzname, keyname);
 			RegCloseKey(key);
 			break;
 		}
@@ -902,14 +921,14 @@
 		namesize = sizeof(zonename);
 		if ((r = RegQueryValueEx(key, "Dlt", NULL, NULL, zonename, &namesize)) != ERROR_SUCCESS)
 		{
-			gaim_debug_warning("wgaim", "could not query value for 'dlt' to identify Windows timezone: %i", (int) r);
+			gaim_debug_warning("wgaim", "could not query value for 'dlt' to identify Windows timezone: %i\n", (int) r);
 			RegCloseKey(key);
 			break;
 		}
 		if (strcmp(tzname, zonename) == 0)
 		{
 			/* Matched DST zone */
-			strcpy(localtzname, keyname);
+			gaim_strlcpy(localtzname, keyname);
 			RegCloseKey(key);
 			break;
 		}
@@ -926,9 +945,10 @@
 		{
 			if (strcmp(localtzname, win32_tzmap[i].wstd) == 0)
 			{
-				gaim_debug_info("wgaim", "TZ \"%s\" matches localized Windows timezone \"%s\" (\"%s\")",
+#if 0
+				gaim_debug_info("wgaim", "TZ \"%s\" matches localized Windows timezone \"%s\" (\"%s\")\n",
 				                win32_tzmap[i].ustd, tzname, localtzname);
-
+#endif
 				/* Cache the Result */
 				if (win32_tzmap[0].wstd[0] != '\0')
 					g_free(win32_tzmap[0].wstd);
@@ -939,9 +959,10 @@
 			}
 			if (strcmp(localtzname, win32_tzmap[i].wdst) == 0)
 			{
-				gaim_debug_info("wgaim", "TZ \"%s\" matches localized Windows timezone \"%s\" (\"%s\")",
+#if 0
+				gaim_debug_info("wgaim", "TZ \"%s\" matches localized Windows timezone \"%s\" (\"%s\")\n",
 				                win32_tzmap[i].udst, tzname, localtzname);
-
+#endif
 				/* Cache the Result */
 				if (win32_tzmap[0].wdst[0] != '\0')
 					g_free(win32_tzmap[0].wdst);
@@ -954,7 +975,7 @@
 		}
 	}
 
-	gaim_debug_warning("wgaim", "could not find a match for Windows timezone \"%s\"", tzname);
+	gaim_debug_warning("wgaim", "could not find a match for Windows timezone \"%s\"\n", tzname);
 	return "";
 }