diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-02-17 13:45:24 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-02-17 14:22:04 -0800 |
| commit | 117f425f68a087c833ee5ad17e3b17094360b184 (patch) | |
| tree | a6d873c68f23805df1092d209d89f5c3c37e2a96 | |
| parent | 1c4827041087c539af3261b6947b2fd4db26f9d7 (diff) | |
Use XtAsprintf to simplify os_name string generation
Raises minimum libXt requirement to 1.1.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/CvtStdSel.c | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index ce7ace2..2a929b1 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ XORG_WITH_XSLTPROC XORG_CHECK_SGML_DOCTOOLS(1.8) # Obtain compiler/linker options for dependencies -PKG_CHECK_MODULES(XMU, xt xext x11 xextproto) +PKG_CHECK_MODULES(XMU, [xt >= 1.1 xext x11 xextproto]) PKG_CHECK_MODULES(XMUU, x11) # Checks for library functions. diff --git a/src/CvtStdSel.c b/src/CvtStdSel.c index 7af31c8..6dfe7ca 100644 --- a/src/CvtStdSel.c +++ b/src/CvtStdSel.c @@ -94,12 +94,8 @@ get_os_name(void) if (uname (&utss) >= 0) { char *os_name; - int len = strlen(utss.sysname) + 1; - len += 2 + strlen(utss.release); - os_name = XtMalloc (len); - strcpy (os_name, utss.sysname); - strcat (os_name, " "); - strcat (os_name, utss.release); + + XtAsprintf(&os_name, "%s %s", utss.sysname, utss.release); return os_name; } #endif |