libsm: Changes to 'upstream-unstable'
.gitignore | 1
configure.ac | 2 -
src/SMlibint.h | 9 --------
src/globals.h | 19 -----------------
src/sm_client.c | 18 +++++++++++++---
src/sm_error.c | 4 +--
src/sm_genid.c | 61 ++++++++++++++-----------------------------------------
src/sm_manager.c | 18 +++++++++++++---
8 files changed, 50 insertions(+), 82 deletions(-)
New commits:
commit 837384e09dae2beda6ac3b8e1d10698dc0d23db4
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun May 13 14:21:39 2007 +0200
Bumped version to 1.0.3.
diff --git a/configure.ac b/configure.ac
index b8fdfb4..4a72c19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libSM],
- 1.0.2,
+ 1.0.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libSM)
commit 6c50f3639d74edd757dc72dbe6a29cb8aa3b87a3
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun May 13 11:47:47 2007 +0200
Another tiny char* vs const char* fix.
diff --git a/src/sm_manager.c b/src/sm_manager.c
index c75764f..51ac548 100644
--- a/src/sm_manager.c
+++ b/src/sm_manager.c
@@ -76,7 +76,7 @@ _SmsProtocolSetupProc (IceConn iceConn,
if ((smsConn = (SmsConn) malloc (sizeof (struct _SmsConn))) == NULL)
{
- char *str = "Memory allocation failed";
+ const char *str = "Memory allocation failed";
if ((*failureReasonRet = (char *) malloc (strlen (str) + 1)) != NULL)
strcpy (*failureReasonRet, str);
commit 9bfa1101ac5dbb8d2de1d0431d7e7b281428168f
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun May 13 11:46:16 2007 +0200
Revert "Don't reinvent the wheel and just use strdup()."
This reverts commit 57ea148fdbf047a012b361acdc7954e70679dad3.
diff --git a/src/sm_manager.c b/src/sm_manager.c
index f2b4cd1..c75764f 100644
--- a/src/sm_manager.c
+++ b/src/sm_manager.c
@@ -76,7 +76,10 @@ _SmsProtocolSetupProc (IceConn iceConn,
if ((smsConn = (SmsConn) malloc (sizeof (struct _SmsConn))) == NULL)
{
- *failureReasonRet = strdup ("Memory allocation failed");
+ char *str = "Memory allocation failed";
+
+ if ((*failureReasonRet = (char *) malloc (strlen (str) + 1)) != NULL)
+ strcpy (*failureReasonRet, str);
return (0);
}
commit 24ac7974ef77d7832a8b3ddd300083c41a03cb79
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun May 13 01:44:12 2007 +0200
Added object files to .gitignore.
diff --git a/.gitignore b/.gitignore
index 7996c60..4ff4fed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ missing
mkinstalldirs
sm.pc
stamp-h1
+*.o
commit 48d23e452780f327439a859fa941b1598eb249c8
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun May 13 01:43:49 2007 +0200
Removed some global writable variables.
diff --git a/src/SMlibint.h b/src/SMlibint.h
index e9fa9cd..dce55b2 100644
--- a/src/SMlibint.h
+++ b/src/SMlibint.h
@@ -499,15 +499,6 @@ struct _SmsConn {
extern int _SmcOpcode;
extern int _SmsOpcode;
-extern int _SmVersionCount;
-extern IcePoVersionRec _SmcVersions[];
-extern IcePaVersionRec _SmsVersions[];
-
-extern int _SmAuthCount;
-extern char *_SmAuthNames[];
-extern IcePoAuthProc _SmcAuthProcs[];
-extern IcePaAuthProc _SmsAuthProcs[];
-
extern SmsNewClientProc _SmsNewClientProc;
extern SmPointer _SmsNewClientData;
diff --git a/src/globals.h b/src/globals.h
index 2f26a78..40b0ffc 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -34,28 +34,9 @@ in this Software without prior written authorization from The Open Group.
extern void _SmcDefaultErrorHandler ();
extern void _SmsDefaultErrorHandler ();
-extern IcePoAuthStatus _IcePoMagicCookie1Proc ();
-extern IcePaAuthStatus _IcePaMagicCookie1Proc ();
-
-extern void _SmcProcessMessage ();
-extern void _SmsProcessMessage ();
-
int _SmcOpcode = 0;
int _SmsOpcode = 0;
-int _SmVersionCount = 1;
-
-IcePoVersionRec _SmcVersions[] = {
- {SmProtoMajor, SmProtoMinor, _SmcProcessMessage}};
-
-IcePaVersionRec _SmsVersions[] = {
- {SmProtoMajor, SmProtoMinor, _SmsProcessMessage}};
-
-int _SmAuthCount = 1;
-char *_SmAuthNames[] = {"MIT-MAGIC-COOKIE-1"};
-IcePoAuthProc _SmcAuthProcs[] = {_IcePoMagicCookie1Proc};
-IcePaAuthProc _SmsAuthProcs[] = {_IcePaMagicCookie1Proc};
-
#ifndef __UNIXOS2__
SmsNewClientProc _SmsNewClientProc;
SmPointer _SmsNewClientData;
diff --git a/src/sm_client.c b/src/sm_client.c
index 047924b..03ffc0e 100644
--- a/src/sm_client.c
+++ b/src/sm_client.c
@@ -38,6 +38,8 @@ in this Software without prior written authorization from The Open Group.
#include "SMlibint.h"
#include "globals.h"
+extern IcePoAuthStatus _IcePoMagicCookie1Proc ();
+extern void _SmcProcessMessage ();
static void set_callbacks();
@@ -73,6 +75,16 @@ char *errorStringRet;
_SmcRegisterClientReply reply;
Bool gotReply, ioErrorOccured;
+ const char *auth_names[] = {"MIT-MAGIC-COOKIE-1"};
+ IcePoAuthProc auth_procs[] = {_IcePoMagicCookie1Proc};
+ int auth_count = 1;
+
+ IcePoVersionRec versions[] = {
+ {SmProtoMajor, SmProtoMinor, _SmcProcessMessage}
+ };
+ int version_count = 1;
+
+
*clientIdRet = NULL;
if (errorStringRet && errorLength > 0)
@@ -83,13 +95,13 @@ char *errorStringRet;
/*
* For now, there is only one version of XSMP, so we don't
* have to check {xsmpMajorRev, xsmpMinorRev}. In the future,
- * we will check against _SmcVersions and generate the list
+ * we will check against versions and generate the list
* of versions the application actually supports.
*/
if ((_SmcOpcode = IceRegisterForProtocolSetup ("XSMP",
- SmVendorString, SmReleaseString, _SmVersionCount, _SmcVersions,
- _SmAuthCount, _SmAuthNames, _SmcAuthProcs, NULL)) < 0)
+ SmVendorString, SmReleaseString, version_count, versions,
+ auth_count, auth_names, auth_procs, NULL)) < 0)
{
if (errorStringRet && errorLength > 0) {
strncpy (errorStringRet,
diff --git a/src/sm_manager.c b/src/sm_manager.c
index 57f53b5..f2b4cd1 100644
--- a/src/sm_manager.c
+++ b/src/sm_manager.c
@@ -42,6 +42,9 @@ in this Software without prior written authorization from The Open Group.
#undef shutdown
#endif
+extern IcePaAuthStatus _IcePaMagicCookie1Proc ();
+extern void _SmsProcessMessage ();
+
static Status
@@ -123,6 +126,15 @@ int errorLength;
char *errorStringRet;
{
+ const char *auth_names[] = {"MIT-MAGIC-COOKIE-1"};
+ IcePaAuthProc auth_procs[] = {_IcePaMagicCookie1Proc};
+ int auth_count = 1;
+
+ IcePaVersionRec versions[] = {
+ {SmProtoMajor, SmProtoMinor, _SmsProcessMessage}
+ };
+ int version_count = 1;
+
if (errorStringRet && errorLength > 0)
*errorStringRet = '\0';
@@ -142,8 +154,8 @@ char *errorStringRet;
{
if ((_SmsOpcode = IceRegisterForProtocolReply ("XSMP",
- vendor, release, _SmVersionCount, _SmsVersions,
- _SmAuthCount, _SmAuthNames, _SmsAuthProcs, hostBasedAuthProc,
+ vendor, release, version_count, versions,
+ auth_count, auth_names, auth_procs, hostBasedAuthProc,
_SmsProtocolSetupProc,
NULL, /* IceProtocolActivateProc - we don't care about
when the Protocol Reply is sent, because the
commit 57ea148fdbf047a012b361acdc7954e70679dad3
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun May 13 00:49:58 2007 +0200
Don't reinvent the wheel and just use strdup().
diff --git a/src/sm_manager.c b/src/sm_manager.c
index df9c221..57f53b5 100644
--- a/src/sm_manager.c
+++ b/src/sm_manager.c
@@ -73,10 +73,7 @@ _SmsProtocolSetupProc (IceConn iceConn,
if ((smsConn = (SmsConn) malloc (sizeof (struct _SmsConn))) == NULL)
{
- char *str = "Memory allocation failed";
-
- if ((*failureReasonRet = (char *) malloc (strlen (str) + 1)) != NULL)
- strcpy (*failureReasonRet, str);
+ *failureReasonRet = strdup ("Memory allocation failed");
return (0);
}
commit 8ba3325ed15154a933c064831abf8f412a5154a7
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun May 13 00:44:50 2007 +0200
Fixed some const vs non-const mix ups.
diff --git a/src/sm_error.c b/src/sm_error.c
index 50a476e..615cead 100644
--- a/src/sm_error.c
+++ b/src/sm_error.c
@@ -59,7 +59,7 @@ SmPointer values;
{
char *pData = (char *) values;
- char *str;
+ const char *str;
switch (offendingMinorOpcode)
{
@@ -191,7 +191,7 @@ SmPointer values;
{
char *pData = (char *) values;
- char *str;
+ const char *str;
switch (offendingMinorOpcode)
{
commit 2ded69bb857ae453d90534203e5857ac3a31a1c3
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun May 13 00:16:36 2007 +0200
Sanitized hex string conversion in SmsGenerateClientID().
This reduces the size of the DSO by almost 4K and gets rid of 255
relocations on load.
diff --git a/src/sm_genid.c b/src/sm_genid.c
index bf06644..1d1e0a3 100644
--- a/src/sm_genid.c
+++ b/src/sm_genid.c
@@ -78,51 +78,15 @@ in this Software without prior written authorization from The Open Group.
#define TCPCONN
#endif
-
-static char *hex_table[] = { /* for generating client IDs */
- "00", "01", "02", "03", "04", "05", "06", "07",
- "08", "09", "0a", "0b", "0c", "0d", "0e", "0f",
- "10", "11", "12", "13", "14", "15", "16", "17",
- "18", "19", "1a", "1b", "1c", "1d", "1e", "1f",
- "20", "21", "22", "23", "24", "25", "26", "27",
- "28", "29", "2a", "2b", "2c", "2d", "2e", "2f",
- "30", "31", "32", "33", "34", "35", "36", "37",
- "38", "39", "3a", "3b", "3c", "3d", "3e", "3f",
- "40", "41", "42", "43", "44", "45", "46", "47",
- "48", "49", "4a", "4b", "4c", "4d", "4e", "4f",
- "50", "51", "52", "53", "54", "55", "56", "57",
- "58", "59", "5a", "5b", "5c", "5d", "5e", "5f",
- "60", "61", "62", "63", "64", "65", "66", "67",
- "68", "69", "6a", "6b", "6c", "6d", "6e", "6f",
- "70", "71", "72", "73", "74", "75", "76", "77",
- "78", "79", "7a", "7b", "7c", "7d", "7e", "7f",
- "80", "81", "82", "83", "84", "85", "86", "87",
- "88", "89", "8a", "8b", "8c", "8d", "8e", "8f",
- "90", "91", "92", "93", "94", "95", "96", "97",
- "98", "99", "9a", "9b", "9c", "9d", "9e", "9f",
- "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7",
- "a8", "a9", "aa", "ab", "ac", "ad", "ae", "af",
- "b0", "b1", "b2", "b3", "b4", "b5", "b6", "b7",
- "b8", "b9", "ba", "bb", "bc", "bd", "be", "bf",
- "c0", "c1", "c2", "c3", "c4", "c5", "c6", "c7",
- "c8", "c9", "ca", "cb", "cc", "cd", "ce", "cf",
- "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7",
- "d8", "d9", "da", "db", "dc", "dd", "de", "df",
- "e0", "e1", "e2", "e3", "e4", "e5", "e6", "e7",
- "e8", "e9", "ea", "eb", "ec", "ed", "ee", "ef",
- "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",
- "f8", "f9", "fa", "fb", "fc", "fd", "fe", "ff",
-};
-
-
char *
SmsGenerateClientID (smsConn)
SmsConn smsConn;
{
#if defined(TCPCONN) || defined(STREAMSCONN)
+ static const char hex[] = "0123456789abcdef";
char hostname[256];
- char address[64];
+ char address[64], *addr_ptr = address;
char temp[256];
char *id;
static int sequence = 0;
@@ -153,13 +117,15 @@ SmsGenerateClientID (smsConn)
if (ai->ai_family == AF_INET6) {
unsigned char *cp = (unsigned char *) &((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr.s6_addr;
- address[0] = '6'; /* IPv6 address code */
- address[1] = '\0';
+ *addr_ptr++ = '6'; /* IPv6 address code */
for (i = 0 ; i < 16 ; i++) {
- strcat(address, hex_table[cp[i]]);
+ *addr_ptr++ = hex[cp[i] >> 4];
+ *addr_ptr++ = hex[cp[i] & 0x0f];
}
+ *addr_ptr++ = '\0';
+
} else { /* Fall through to IPv4 address handling */
haddr = &((struct sockaddr_in *)ai->ai_addr)->sin_addr;
#else
@@ -193,10 +159,15 @@ SmsGenerateClientID (smsConn)
decimal[3] = atoi (ptr1);
- address[0] = '1';
- address[1] = '\0';
- for (i = 0; i < 4; i++)
- strcat (address, hex_table[decimal[i]]);
+ *addr_ptr++ = '1';
+
+ for (i = 0; i < 4; i++) {
+ *addr_ptr++ = hex[decimal[i] >> 4];
+ *addr_ptr++ = hex[decimal[i] & 0x0f];
+ }
+
+ *addr_ptr++ = '\0';
+
#if defined(IPv6) && defined(AF_INET6)
}
freeaddrinfo(first_ai);
Reply to: