.gitignore | 1 COPYING | 32 +++++++------- Makefile.am | 8 +-- configure.ac | 88 +++++++++++++++++++--------------------- doc/FSlib.txt | 12 ++--- include/X11/fonts/FSlib.h | 76 +++++++++++++++++----------------- src/FSClServ.c | 30 ++++++------- src/FSCloseFt.c | 30 ++++++------- src/FSConnServ.c | 28 ++++++------ src/FSErrDis.c | 30 ++++++------- src/FSErrHndlr.c | 32 +++++++------- src/FSFlush.c | 28 ++++++------ src/FSFontInfo.c | 36 ++++++++-------- src/FSFtNames.c | 30 ++++++------- src/FSGetCats.c | 28 ++++++------ src/FSListCats.c | 30 ++++++------- src/FSListExt.c | 28 ++++++------ src/FSMisc.c | 28 ++++++------ src/FSNextEv.c | 28 ++++++------ src/FSOpenFont.c | 28 ++++++------ src/FSOpenServ.c | 34 +++++++-------- src/FSQGlyphs.c | 33 +++++++-------- src/FSQXExt.c | 34 +++++++-------- src/FSQXInfo.c | 30 ++++++------- src/FSQuExt.c | 28 ++++++------ src/FSServName.c | 34 +++++++-------- src/FSSetCats.c | 28 ++++++------ src/FSSync.c | 28 ++++++------ src/FSSynchro.c | 32 +++++++------- src/FSlibInt.c | 94 ++++++++++++++++++++++++------------------ src/FSlibint.h | 42 +++++++++---------- src/FSlibos.h | 30 ++++++------- src/Makefile.am | 13 ++++- test/FSGetErrorText.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++ test/Makefile.am | 30 +++++++++++++ 35 files changed, 685 insertions(+), 537 deletions(-)
New commits: commit 589eea0713cacb7b6889d15e4dbcd2914684db9b Author: Alan Coopersmith <[email protected]> Date: Fri Mar 2 19:47:42 2012 -0800 libFS 1.0.4 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index f49d78e..e14faf1 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libFS], [1.0.3], +AC_INIT([libFS], [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libFS]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) commit 9e5c931053f261cc97e3d7b75a5c2f14990bbb9d Author: Alan Coopersmith <[email protected]> Date: Fri Mar 2 19:42:18 2012 -0800 Remove unneeded shadow definition of 'i' from FSQueryXBitmaps16 Fixes gcc warning: FSQGlyphs.c: In function 'FSQueryXBitmaps16': FSQGlyphs.c:153:6: warning: declaration of 'i' shadows a previous local FSQGlyphs.c:143:10: warning: shadowed declaration is here Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/src/FSQGlyphs.c b/src/FSQGlyphs.c index 1519d48..bf3c3b2 100644 --- a/src/FSQGlyphs.c +++ b/src/FSQGlyphs.c @@ -150,7 +150,6 @@ FSQueryXBitmaps16( req->length += ((str_len * SIZEOF(fsChar2b)) + 3) >> 2; if (FSProtocolVersion(svr) == 1) { - int i; fsChar2b_version1 *swapped_str; if (str_len > SIZE_MAX/SIZEOF(fsChar2b_version1)) commit 4ebfa48f74deb4f35490e02eeeb1e59ff56856ab Author: Alan Coopersmith <[email protected]> Date: Sun Dec 4 08:54:38 2011 -0800 Fix builds of FSlibInt.c with Solaris Studio compilers Required in order to build with Studio cc now that xorg-macros is setting -errwarn=E_FUNC_HAS_NO_RETURN_STMT since a bug in the Solaris system headers causes the noreturn attribute to not be correctly applied to the exit() prototype in <stdlib.h> when building with Studio instead of gcc. Otherwise compiler exits with error: "FSlibInt.c", line 976: Function has no return statement : _FSDefaultIOError Uses Studio-specific pragma instead of adding another exit() prototype with a noreturn attribute to avoid causing gcc to warn about having a redundant prototype for the exit() function. Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/src/FSlibInt.c b/src/FSlibInt.c index eea9840..db9cc47 100644 --- a/src/FSlibInt.c +++ b/src/FSlibInt.c @@ -946,6 +946,11 @@ _SysErrorMsg(int n) return (s ? s : "no such error"); } +#ifdef __SUNPRO_C +/* prevent "Function has no return statement" error for _FSDefaultIOError */ +#pragma does_not_return(exit) +#endif + /* * _FSDefaultIOError - Default fatal system error reporting routine. Called * when an X internal system error is encountered. commit 447b3268bfb2d6a92d105ad75c2ac5462f1adecb Author: Alan Coopersmith <[email protected]> Date: Fri Nov 11 22:54:21 2011 -0800 Mark pattern argument to FSListFonts* as const char * Needed to fix gcc -Wwrite-strings warnings in clients such as fslsfonts Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/doc/FSlib.txt b/doc/FSlib.txt index d67fff1..5f686f3 100644 --- a/doc/FSlib.txt +++ b/doc/FSlib.txt @@ -42,7 +42,7 @@ Closes the font. char ** FSListFonts( FSServer *svr, - char *pattern, + const char *pattern, int maxNames, int *actualCount); @@ -59,7 +59,7 @@ Frees the list of font names returned by FSListFonts. char ** FSListFontsWithXInfo( FSServer *svr, - char *pattern, + const char *pattern, int maxNames, int *actualCount, fsFontHeader ***info, diff --git a/include/X11/fonts/FSlib.h b/include/X11/fonts/FSlib.h index fbc2dc9..11b3ba6 100644 --- a/include/X11/fonts/FSlib.h +++ b/include/X11/fonts/FSlib.h @@ -258,9 +258,9 @@ extern char ** FSGetCatalogues ( FSServer *svr, int *num ); extern long FSMaxRequestSize ( FSServer *svr ); -extern char ** FSListFonts ( FSServer *svr, char *pattern, int maxNames, +extern char ** FSListFonts ( FSServer *svr, const char *pattern, int maxNames, int *actualCount ); -extern char ** FSListFontsWithXInfo ( FSServer *svr, char *pattern, +extern char ** FSListFontsWithXInfo ( FSServer *svr, const char *pattern, int maxNames, int *count, FSXFontInfoHeader ***info, FSPropInfo ***pprops, diff --git a/src/FSFontInfo.c b/src/FSFontInfo.c index 3d449bf..d9c84b6 100644 --- a/src/FSFontInfo.c +++ b/src/FSFontInfo.c @@ -56,7 +56,7 @@ in this Software without prior written authorization from The Open Group. char ** FSListFontsWithXInfo( FSServer *svr, - char *pattern, + const char *pattern, int maxNames, int *count, FSXFontInfoHeader ***info, diff --git a/src/FSFtNames.c b/src/FSFtNames.c index 7d21efb..9624205 100644 --- a/src/FSFtNames.c +++ b/src/FSFtNames.c @@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group. char ** FSListFonts( FSServer *svr, - char *pattern, + const char *pattern, int maxNames, int *actualCount) { diff --git a/src/FSlibInt.c b/src/FSlibInt.c index 5a33b64..eea9840 100644 --- a/src/FSlibInt.c +++ b/src/FSlibInt.c @@ -536,7 +536,7 @@ _FSReadPad( void _FSSend( register FSServer *svr, - char *data, + const char *data, register long size) { struct iovec iov[3]; @@ -591,7 +591,7 @@ _FSSend( } InsertIOV(svr->buffer, svrbufsize) - InsertIOV(data, size) + InsertIOV((char *)data, size) InsertIOV(pad, padsize) ESET(0); diff --git a/src/FSlibint.h b/src/FSlibint.h index b44b153..d5a66b8 100644 --- a/src/FSlibint.h +++ b/src/FSlibint.h @@ -74,7 +74,7 @@ extern void _FSFlush ( FSServer *svr ); extern void _FSRead ( FSServer *svr, char *data, long size ); extern void _FSReadEvents ( FSServer *svr ); extern void _FSReadPad ( FSServer *svr, char *data, long size ); -extern void _FSSend ( FSServer *svr, char *data, long size ); +extern void _FSSend ( FSServer *svr, const char *data, long size ); extern void _FSEnq ( FSServer *svr, fsEvent *event ); extern void _FSFreeServerStructure ( FSServer *svr ); extern int _FSError ( FSServer *svr, fsError *rep ); commit 5dae1f32a775c3f99f26571f3fab8fb4f0f2874f Author: Alan Coopersmith <[email protected]> Date: Wed Sep 28 22:28:22 2011 -0700 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 <[email protected]> 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; commit 1353bd6b52241857f9e37cc6403e1fee3c5e69e4 Author: Alan Coopersmith <[email protected]> Date: Mon Sep 26 15:07:57 2011 -0700 Add const attributes to fix gcc -Wwrite-strings warnings Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/src/FSlibInt.c b/src/FSlibInt.c index 16c803f..5a33b64 100644 --- a/src/FSlibInt.c +++ b/src/FSlibInt.c @@ -61,7 +61,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xos.h> static void _EatData32 ( FSServer *svr, unsigned long n ); -static char * _SysErrorMsg ( int n ); +static const char * _SysErrorMsg ( int n ); /* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX * systems are broken and return EWOULDBLOCK when they should return EAGAIN @@ -938,7 +938,7 @@ _FSWireToEvent( } -static char * +static const char * _SysErrorMsg(int n) { char *s = strerror(n); @@ -1018,7 +1018,7 @@ _FSPrintDefaultError( char buffer[BUFSIZ]; char mesg[BUFSIZ]; char number[32]; - char *mtype = "FSlibMessage"; + const char *mtype = "FSlibMessage"; register _FSExtension *ext = (_FSExtension *) NULL; (void) FSGetErrorText(svr, event->error_code, buffer, BUFSIZ); commit 750fbfe7562e94788e5dfecb6617e26d6d3f0157 Author: Alan Coopersmith <[email protected]> Date: Fri Sep 16 22:08:05 2011 -0700 Strip trailing whitespace Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' git diff -w & git diff -b show no diffs from this change Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/COPYING b/COPYING index c175e11..59c5765 100644 --- a/COPYING +++ b/COPYING @@ -23,24 +23,24 @@ in this Software without prior written authorization from The Open Group. Copyright 1990 Network Computing Devices; Portions Copyright 1987 by Digital Equipment Corporation -Permission to use, copy, modify, distribute, and sell this software -and its documentation for any purpose is hereby granted without fee, -provided that the above copyright notice appear in all copies and -that both that copyright notice and this permission notice appear -in supporting documentation, and that the names of Network Computing -Devices or Digital not be used in advertising or publicity pertaining -to distribution of the software without specific, written prior -permission. Network Computing Devices or Digital make no representations -about the suitability of this software for any purpose. It is provided +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and +that both that copyright notice and this permission notice appear +in supporting documentation, and that the names of Network Computing +Devices or Digital not be used in advertising or publicity pertaining +to distribution of the software without specific, written prior +permission. Network Computing Devices or Digital make no representations +about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH -REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF +REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES -OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES -OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES +OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 2005 Red Hat, Inc @@ -65,7 +65,7 @@ PERFORMANCE OF THIS SOFTWARE. Copyright 2001,2003 Keith Packard Copyright 2003 Keith Packard, Noah Levitt - + Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that @@ -75,7 +75,7 @@ advertising or publicity pertaining to distribution of the software without specific, written prior permission. Keith Packard makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. - + KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR diff --git a/Makefile.am b/Makefile.am index 9ad8db5..29da0e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ -# +# # Copyright © 2003 Keith Packard, Noah Levitt -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ # specific, written prior permission. Keith Packard makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR diff --git a/configure.ac b/configure.ac index 119328e..f49d78e 100644 --- a/configure.ac +++ b/configure.ac @@ -50,7 +50,7 @@ XTRANS_CONNECTION_FLAGS # Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([FS]) - + AC_CONFIG_FILES([Makefile src/Makefile test/Makefile diff --git a/include/X11/fonts/FSlib.h b/include/X11/fonts/FSlib.h index 94f0552..9060791 100644 --- a/include/X11/fonts/FSlib.h +++ b/include/X11/fonts/FSlib.h @@ -2,24 +2,24 @@ * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation, and that the names of Network Computing - * Devices or Digital not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. Network Computing Devices or Digital make no representations - * about the suitability of this software for any purpose. It is provided + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation, and that the names of Network Computing + * Devices or Digital not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Network Computing Devices or Digital make no representations + * about the suitability of this software for any purpose. It is provided * "as is" without express or implied warranty. * * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF + * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES - * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES - * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, - * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES + * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ @@ -249,25 +249,25 @@ extern FSSyncHandler FSSetAfterFunction(FSServer *, FSSyncHandler); extern char * FSServerName ( char *server ); extern char ** FSListExtensions ( FSServer *svr, int *next ); -extern int FSQueryExtension ( FSServer *svr, char *name, int *major_opcode, +extern int FSQueryExtension ( FSServer *svr, char *name, int *major_opcode, int *first_event, int *first_error ); -extern char ** FSListCatalogues ( FSServer *svr, char *pattern, +extern char ** FSListCatalogues ( FSServer *svr, char *pattern, int maxNames, int *actualCount ); extern char ** FSGetCatalogues ( FSServer *svr, int *num ); extern long FSMaxRequestSize ( FSServer *svr ); -extern char ** FSListFonts ( FSServer *svr, char *pattern, int maxNames, +extern char ** FSListFonts ( FSServer *svr, char *pattern, int maxNames, int *actualCount ); -extern char ** FSListFontsWithXInfo ( FSServer *svr, char *pattern, - int maxNames, int *count, - FSXFontInfoHeader ***info, - FSPropInfo ***pprops, - FSPropOffset ***offsets, +extern char ** FSListFontsWithXInfo ( FSServer *svr, char *pattern, + int maxNames, int *count, + FSXFontInfoHeader ***info, + FSPropInfo ***pprops, + FSPropOffset ***offsets, unsigned char ***prop_data ); -extern Font FSOpenBitmapFont ( FSServer *svr, FSBitmapFormat hint, - FSBitmapFormatMask fmask, char *name, +extern Font FSOpenBitmapFont ( FSServer *svr, FSBitmapFormat hint, + FSBitmapFormatMask fmask, char *name, Font *otherid ); extern int FSSync ( FSServer *svr, Bool discard ); @@ -277,29 +277,29 @@ extern int FSCloseFont ( FSServer *svr, Font fid ); extern int FSGetErrorDatabaseText ( FSServer *svr, const char *name, const char *type, const char *defaultp, char *buffer, int nbytes ); -extern int FSGetErrorText ( FSServer *svr, int code, char *buffer, - +extern int FSGetErrorText ( FSServer *svr, int code, char *buffer, + int nbytes ); extern int FSFlush ( FSServer *svr ); extern int FSFreeFontNames ( char **list ); extern int FSFreeCatalogues ( char **list ); extern int FSFreeExtensionList ( char **list ); extern int FSNextEvent ( FSServer *svr, FSEvent *event ); -extern int FSQueryXBitmaps8 ( FSServer *svr, Font fid, FSBitmapFormat format, - int range_type, unsigned char *str, - unsigned long str_len, FSOffset **offsets, +extern int FSQueryXBitmaps8 ( FSServer *svr, Font fid, FSBitmapFormat format, + int range_type, unsigned char *str, + unsigned long str_len, FSOffset **offsets, unsigned char **glyphdata ); extern int FSQueryXBitmaps16 ( FSServer *svr, Font fid, FSBitmapFormat format, - int range_type, FSChar2b *str, - unsigned long str_len, FSOffset **offsets, + int range_type, FSChar2b *str, + unsigned long str_len, FSOffset **offsets, unsigned char **glyphdata ); -extern int FSQueryXExtents8 ( FSServer *svr, Font fid, int range_type, - unsigned char *str, unsigned long str_len, +extern int FSQueryXExtents8 ( FSServer *svr, Font fid, int range_type, + unsigned char *str, unsigned long str_len, FSXCharInfo **extents ); -extern int FSQueryXExtents16 ( FSServer *svr, Font fid, int range_type, - FSChar2b *str, unsigned long str_len, +extern int FSQueryXExtents16 ( FSServer *svr, Font fid, int range_type, + FSChar2b *str, unsigned long str_len, FSXCharInfo **extents ); -extern int FSQueryXInfo ( FSServer *svr, Font fid, FSXFontInfoHeader *info, +extern int FSQueryXInfo ( FSServer *svr, Font fid, FSXFontInfoHeader *info, FSPropInfo *props, FSPropOffset **offsets, unsigned char **prop_data ); extern int FSSetCatalogues ( FSServer *svr, int num, char **cats ); diff --git a/src/FSClServ.c b/src/FSClServ.c index 2792f5c..0a43781 100644 --- a/src/FSClServ.c +++ b/src/FSClServ.c @@ -2,24 +2,24 @@ * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation, and that the names of Network Computing - * Devices or Digital not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. Network Computing Devices or Digital make no representations - * about the suitability of this software for any purpose. It is provided + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation, and that the names of Network Computing + * Devices or Digital not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Network Computing Devices or Digital make no representations + * about the suitability of this software for any purpose. It is provided * "as is" without express or implied warranty. * * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF + * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES - * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES - * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, - * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES + * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ @@ -55,7 +55,7 @@ in this Software without prior written authorization from The Open Group. #include "FSlib.h" #include "FSlibint.h" -int +int FSCloseServer(FSServer *svr) { _FSExtension *ext; diff --git a/src/FSCloseFt.c b/src/FSCloseFt.c index 296f63b..1879500 100644 --- a/src/FSCloseFt.c +++ b/src/FSCloseFt.c @@ -2,24 +2,24 @@ * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation, and that the names of Network Computing - * Devices or Digital not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. Network Computing Devices or Digital make no representations - * about the suitability of this software for any purpose. It is provided + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation, and that the names of Network Computing + * Devices or Digital not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Network Computing Devices or Digital make no representations + * about the suitability of this software for any purpose. It is provided * "as is" without express or implied warranty. * * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF + * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES - * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES - * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, - * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES + * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ @@ -55,7 +55,7 @@ in this Software without prior written authorization from The Open Group. #include "FSlibint.h" -int +int FSCloseFont( FSServer *svr, Font fid) diff --git a/src/FSConnServ.c b/src/FSConnServ.c index ac09401..e2c1ab8 100644 --- a/src/FSConnServ.c +++ b/src/FSConnServ.c @@ -2,24 +2,24 @@ * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation, and that the names of Network Computing - * Devices or Digital not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. Network Computing Devices or Digital make no representations - * about the suitability of this software for any purpose. It is provided + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation, and that the names of Network Computing + * Devices or Digital not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Network Computing Devices or Digital make no representations + * about the suitability of this software for any purpose. It is provided * "as is" without express or implied warranty. * * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF + * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES - * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES - * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, - * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES + * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ diff --git a/src/FSErrDis.c b/src/FSErrDis.c index 5c1188f..e3d296e 100644 --- a/src/FSErrDis.c +++ b/src/FSErrDis.c @@ -2,24 +2,24 @@ * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation, and that the names of Network Computing - * Devices or Digital not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. Network Computing Devices or Digital make no representations - * about the suitability of this software for any purpose. It is provided + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation, and that the names of Network Computing + * Devices or Digital not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Network Computing Devices or Digital make no representations + * about the suitability of this software for any purpose. It is provided * "as is" without express or implied warranty. * * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF + * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES - * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES - * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, - * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES + * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ diff --git a/src/FSErrHndlr.c b/src/FSErrHndlr.c index b5cb119..37e1dad 100644 --- a/src/FSErrHndlr.c +++ b/src/FSErrHndlr.c @@ -2,24 +2,24 @@ * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation, and that the names of Network Computing - * Devices or Digital not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. Network Computing Devices or Digital make no representations - * about the suitability of this software for any purpose. It is provided + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation, and that the names of Network Computing + * Devices or Digital not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Network Computing Devices or Digital make no representations + * about the suitability of this software for any purpose. It is provided * "as is" without express or implied warranty. * * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF + * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES - * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES - * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, - * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES + * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ @@ -54,7 +54,7 @@ in this Software without prior written authorization from The Open Group. #endif #include "FSlibint.h" -FSErrorHandler +FSErrorHandler FSSetErrorHandler(FSErrorHandler handler) { FSErrorHandler oldhandler = _FSErrorFunction; @@ -67,7 +67,7 @@ FSSetErrorHandler(FSErrorHandler handler) return oldhandler; } -FSIOErrorHandler +FSIOErrorHandler FSSetIOErrorHandler(FSIOErrorHandler handler) { FSIOErrorHandler oldhandler = _FSIOErrorFunction; diff --git a/src/FSFlush.c b/src/FSFlush.c index 4beb46d..779e71b 100644 --- a/src/FSFlush.c +++ b/src/FSFlush.c @@ -3,24 +3,24 @@ * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation, and that the names of Network Computing - * Devices or Digital not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. Network Computing Devices or Digital make no representations - * about the suitability of this software for any purpose. It is provided + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation, and that the names of Network Computing + * Devices or Digital not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Network Computing Devices or Digital make no representations + * about the suitability of this software for any purpose. It is provided * "as is" without express or implied warranty. * * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF + * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES - * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES - * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, - * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES + * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ diff --git a/src/FSFontInfo.c b/src/FSFontInfo.c index aa0c8cc..3d449bf 100644 --- a/src/FSFontInfo.c +++ b/src/FSFontInfo.c @@ -2,24 +2,24 @@ * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation, and that the names of Network Computing - * Devices or Digital not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. Network Computing Devices or Digital make no representations - * about the suitability of this software for any purpose. It is provided + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation, and that the names of Network Computing + * Devices or Digital not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Network Computing Devices or Digital make no representations + * about the suitability of this software for any purpose. It is provided * "as is" without express or implied warranty. * * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF + * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES - * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES - * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, - * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES + * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ @@ -126,11 +126,11 @@ FSListFontsWithXInfo( break; if ((i + reply.nReplies) >= size) { - if (reply.nReplies > SIZE_MAX - i - 1) + if (reply.nReplies > SIZE_MAX - i - 1) goto badmem; size = i + reply.nReplies + 1; - if (size > SIZE_MAX / sizeof(char *)) + if (size > SIZE_MAX / sizeof(char *)) goto badmem; if (fhdr) { @@ -274,7 +274,7 @@ FSListFontsWithXInfo( po[i][j].value.length = local_po.value.length; po[i][j].type = local_po.type; } - + /* get prop data */ if (FSProtocolVersion(svr) == 1) _FSReadPad(svr, (char *) pd[i], pi[i]->data_len); diff --git a/src/FSFtNames.c b/src/FSFtNames.c index b5b2af5..7d21efb 100644 --- a/src/FSFtNames.c +++ b/src/FSFtNames.c @@ -2,24 +2,24 @@ * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation, and that the names of Network Computing - * Devices or Digital not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. Network Computing Devices or Digital make no representations - * about the suitability of this software for any purpose. It is provided + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation, and that the names of Network Computing + * Devices or Digital not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Network Computing Devices or Digital make no representations + * about the suitability of this software for any purpose. It is provided * "as is" without express or implied warranty. * * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF + * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES - * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES - * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, - * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES + * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
