Author: cazfi
Date: Mon Apr 11 19:36:53 2016
New Revision: 32358
URL: http://svn.gna.org/viewcvs/freeciv?rev=32358&view=rev
Log:
Removed unused fc_uname()
See patch #7027
Modified:
trunk/utility/support.c
trunk/utility/support.h
Modified: trunk/utility/support.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/support.c?rev=32358&r1=32357&r2=32358&view=diff
==============================================================================
--- trunk/utility/support.c (original)
+++ trunk/utility/support.c Mon Apr 11 19:36:53 2016
@@ -1199,112 +1199,6 @@
}
/*****************************************************************
- Returns an uname like string.
-*****************************************************************/
-void fc_uname(char *buf, size_t len)
-{
-#ifdef HAVE_UNAME
- {
- struct utsname un;
-
- uname(&un);
- fc_snprintf(buf, len, "%s %s [%s]", un.sysname, un.release, un.machine);
- }
-#else /* ! HAVE_UNAME */
- /* Fill in here if you are making a binary without sys/utsname.h and know
- the OS name, release number, and machine architechture */
-#ifdef WIN32_NATIVE
- {
- /* TODO: Add handling of newer Windows versions. */
- char cpuname[16];
- char *osname;
- SYSTEM_INFO sysinfo;
- OSVERSIONINFO osvi;
-
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
-
- switch (osvi.dwPlatformId) {
- case VER_PLATFORM_WIN32s:
- osname = "Win32s";
- break;
-
- case VER_PLATFORM_WIN32_WINDOWS:
- osname = "Win32";
-
- if (osvi.dwMajorVersion == 4) {
- switch (osvi.dwMinorVersion) {
- case 0: osname = "Win95"; break;
- case 10: osname = "Win98"; break;
- case 90: osname = "WinME"; break;
- default: break;
- }
- }
- break;
-
- case VER_PLATFORM_WIN32_NT:
- osname = "WinNT";
-
- if (osvi.dwMajorVersion == 5) {
- switch (osvi.dwMinorVersion) {
- case 0: osname = "Win2000"; break;
- case 1: osname = "WinXP"; break;
- default: break;
- }
- }
- break;
-
- default:
- osname = osvi.szCSDVersion;
- break;
- }
-
- GetSystemInfo(&sysinfo);
- switch (sysinfo.wProcessorArchitecture) {
- case PROCESSOR_ARCHITECTURE_INTEL:
- {
- unsigned int ptype;
- if (sysinfo.wProcessorLevel < 3) /* Shouldn't happen. */
- ptype = 3;
- else if (sysinfo.wProcessorLevel > 9) /* P4 */
- ptype = 6;
- else
- ptype = sysinfo.wProcessorLevel;
-
- fc_snprintf(cpuname, sizeof(cpuname), "i%d86", ptype);
- }
- break;
-
- case PROCESSOR_ARCHITECTURE_MIPS:
- sz_strlcpy(cpuname, "mips");
- break;
-
- case PROCESSOR_ARCHITECTURE_ALPHA:
- sz_strlcpy(cpuname, "alpha");
- break;
-
- case PROCESSOR_ARCHITECTURE_PPC:
- sz_strlcpy(cpuname, "ppc");
- break;
-#if 0
- case PROCESSOR_ARCHITECTURE_IA64:
- sz_strlcpy(cpuname, "ia64");
- break;
-#endif
- default:
- sz_strlcpy(cpuname, "unknown");
- break;
- }
- fc_snprintf(buf, len, "%s %ld.%ld [%s]",
- osname, osvi.dwMajorVersion, osvi.dwMinorVersion, cpuname);
- }
-#else /* WIN32_NATIVE */
- fc_snprintf(buf, len, "unknown unknown [unknown]");
-#endif /* WIN32_NATIVE */
-#endif /* HAVE_UNAME */
-}
-
-/*****************************************************************
basename() replacement that always takes const parameter.
POSIX basename() modifies its parameter, GNU one does not.
Ideally we would like to use GNU one, when available, directly
Modified: trunk/utility/support.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/support.h?rev=32358&r1=32357&r2=32358&view=diff
==============================================================================
--- trunk/utility/support.h (original)
+++ trunk/utility/support.h Mon Apr 11 19:36:53 2016
@@ -176,8 +176,6 @@
char fc_toupper(char c);
char fc_tolower(char c);
-void fc_uname(char *buf, size_t len);
-
const char *fc_basename(const char *path);
static bool inline is_bigendian(void)
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
