summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-11-19 11:33:30 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2011-12-09 17:37:09 -0800
commit4af9e4a71f7c07da86ef1940cba69e92b11ba337 (patch)
tree9c067a3a197caebd4759d84edf280442b51db0bc
parente77dd2e4bc8227ebdab70b4233cb33ed690fa264 (diff)
SmsInitialize: Mark vendor & release args as const char *
Needed to fix gcc -Wwrite-strings arguments in callers such as xsm. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: James Cloos <cloos@jhcloos.com>
-rw-r--r--doc/SMlib.xml4
-rw-r--r--include/X11/SM/SMlib.h4
-rw-r--r--src/sm_manager.c3
3 files changed, 6 insertions, 5 deletions
diff --git a/doc/SMlib.xml b/doc/SMlib.xml
index 7577492..6d2a234 100644
--- a/doc/SMlib.xml
+++ b/doc/SMlib.xml
@@ -1500,8 +1500,8 @@ time a new client connects to the session manager.
<funcsynopsis id='SmsInitialize'>
<funcprototype>
<funcdef>Status <function>SmsInitialize</function></funcdef>
- <paramdef>char *<parameter>vendor</parameter></paramdef>
- <paramdef>char *<parameter>release</parameter></paramdef>
+ <paramdef>const char *<parameter>vendor</parameter></paramdef>
+ <paramdef>const char *<parameter>release</parameter></paramdef>
<paramdef>SmsNewClientProc <parameter>new_client_proc</parameter></paramdef>
<paramdef>SmPointer <parameter>manager_data</parameter></paramdef>
<paramdef>IceHostBasedAuthProc <parameter>host_based_auth_proc</parameter></paramdef>
diff --git a/include/X11/SM/SMlib.h b/include/X11/SM/SMlib.h
index fb1166b..9645295 100644
--- a/include/X11/SM/SMlib.h
+++ b/include/X11/SM/SMlib.h
@@ -445,8 +445,8 @@ extern IceConn SmcGetIceConnection (
);
extern Status SmsInitialize (
- char * /* vendor */,
- char * /* release */,
+ const char * /* vendor */,
+ const char * /* release */,
SmsNewClientProc /* newClientProc */,
SmPointer /* managerData */,
IceHostBasedAuthProc /* hostBasedAuthProc */,
diff --git a/src/sm_manager.c b/src/sm_manager.c
index d28c0c5..7a11a33 100644
--- a/src/sm_manager.c
+++ b/src/sm_manager.c
@@ -110,7 +110,8 @@ _SmsProtocolSetupProc (IceConn iceConn,
Status
-SmsInitialize(char *vendor, char *release, SmsNewClientProc newClientProc,
+SmsInitialize(const char *vendor, const char *release,
+ SmsNewClientProc newClientProc,
SmPointer managerData, IceHostBasedAuthProc hostBasedAuthProc,
int errorLength, char *errorStringRet)
{