diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-28 22:28:22 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-11-18 22:16:33 -0800 |
| commit | 5dae1f32a775c3f99f26571f3fab8fb4f0f2874f (patch) | |
| tree | 09aab6825ba8722a86d7155ed141a42e4ca9a755 | |
| parent | 1353bd6b52241857f9e37cc6403e1fee3c5e69e4 (diff) | |
Change FSOpenServer and FSServerName to take const char * args.
Almost matches the current versions of the XOpenDisplay & XDisplayName
functions they're modeled on - unlike XDisplayName, FSServerName now
returns const char * as well so we don't lose the constness of the
string passed in if we return it.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | doc/FSlib.txt | 8 | ||||
| -rw-r--r-- | include/X11/fonts/FSlib.h | 4 | ||||
| -rw-r--r-- | src/FSOpenServ.c | 4 | ||||
| -rw-r--r-- | src/FSServName.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/doc/FSlib.txt b/doc/FSlib.txt index 6d1ee25..d67fff1 100644 --- a/doc/FSlib.txt +++ b/doc/FSlib.txt @@ -6,7 +6,7 @@ Connection Setup FSServer * FSOpenServer( - char *server); + const char *server); Creates a connection to the font server specified in the 'server' string. @@ -221,10 +221,10 @@ FSMaxRequestSize( Returns the largest request size (in 4 byte quantities) that the server can handle. -char * +const char * FSServerName( - char *server); + const char *server); Returns the name that FSlib would use to connect to the server. -Translates a NULL in the value of $FONT_SERVER. +Translates a NULL into the value of $FONT_SERVER. diff --git a/include/X11/fonts/FSlib.h b/include/X11/fonts/FSlib.h index 9060791..fbc2dc9 100644 --- a/include/X11/fonts/FSlib.h +++ b/include/X11/fonts/FSlib.h @@ -242,12 +242,12 @@ typedef struct _FSXFontInfoHeader { _XFUNCPROTOBEGIN -extern FSServer * FSOpenServer ( char *server ); +extern FSServer * FSOpenServer ( const char *server ); extern FSSyncHandler FSSynchronize(FSServer *, int); extern FSSyncHandler FSSetAfterFunction(FSServer *, FSSyncHandler); -extern char * FSServerName ( char *server ); +extern const char * FSServerName ( const char *server ); extern char ** FSListExtensions ( FSServer *svr, int *next ); extern int FSQueryExtension ( FSServer *svr, char *name, int *major_opcode, int *first_event, int *first_error ); diff --git a/src/FSOpenServ.c b/src/FSOpenServ.c index 040b254..32f7d25 100644 --- a/src/FSOpenServ.c +++ b/src/FSOpenServ.c @@ -101,7 +101,7 @@ void OutOfMemory( */ FSServer * -FSOpenServer(char *server) +FSOpenServer(const char *server) { FSServer *svr; int i; @@ -135,7 +135,7 @@ FSOpenServer(char *server) } (void) strcpy(svr->server_name, server); - if ((svr->trans_conn = _FSConnectServer(server)) == NULL) { + if ((svr->trans_conn = _FSConnectServer(svr->server_name)) == NULL) { goto fail; } diff --git a/src/FSServName.c b/src/FSServName.c index 022be82..8885ce5 100644 --- a/src/FSServName.c +++ b/src/FSServName.c @@ -58,10 +58,10 @@ in this Software without prior written authorization from The Open Group. #include <stdlib.h> #include "FSlib.h" -char * -FSServerName(char *server) +const char * +FSServerName(const char *server) { - char *s; + const char *s; if (server != NULL && *server != '\0') return server; |