summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--difs/atom.c7
-rw-r--r--difs/events.c3
-rw-r--r--difs/fonts.c10
-rw-r--r--difs/resource.c6
-rw-r--r--include/extentst.h6
-rw-r--r--os/access.c5
-rw-r--r--os/connection.c3
7 files changed, 29 insertions, 11 deletions
diff --git a/difs/atom.c b/difs/atom.c
index ed42894..74df015 100644
--- a/difs/atom.c
+++ b/difs/atom.c
@@ -50,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
* @(#)atom.c 4.1 5/2/91
*
*/
-/* $XFree86: xc/programs/xfs/difs/atom.c,v 3.4 2001/12/14 20:01:33 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/atom.c,v 3.5 2003/05/27 22:27:05 tsi Exp $ */
#include "misc.h"
#include "fsresource.h"
@@ -106,9 +106,12 @@ MakeAtom(char *string, unsigned int len, Bool makeit)
nd = (NodePtr) fsalloc(sizeof(NodeRec));
if (!nd)
return BAD_RESOURCE;
+#if FSA_LAST_PREDEFINED > 0
if (lastAtom < FSA_LAST_PREDEFINED) {
nd->string = string;
- } else {
+ } else
+#endif
+ {
nd->string = (char *) fsalloc(len + 1);
if (!nd->string) {
fsfree(nd);
diff --git a/difs/events.c b/difs/events.c
index 0475eac..1b087bf 100644
--- a/difs/events.c
+++ b/difs/events.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
* THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/xfs/difs/events.c,v 3.7 2001/12/14 20:01:34 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/events.c,v 3.8 2003/05/23 15:03:11 tsi Exp $ */
#include <swaprep.h>
@@ -103,6 +103,7 @@ ProcGetEventMask(ClientPtr client)
rep.length = SIZEOF(fsGetEventMaskReply) >> 2;
rep.event_mask = client->eventmask;
+ WriteReplyToClient(client, SIZEOF(fsGetEventMaskReply), &rep);
return client->noClientException;
}
diff --git a/difs/fonts.c b/difs/fonts.c
index 95fea42..190e276 100644
--- a/difs/fonts.c
+++ b/difs/fonts.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
* THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/xfs/difs/fonts.c,v 3.13 2001/12/14 20:01:34 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/fonts.c,v 3.14 2003/11/08 02:02:07 dawes Exp $ */
#include "FS.h"
#include "FSproto.h"
@@ -1195,7 +1195,11 @@ do_list_fonts_with_info(ClientPtr client, pointer data)
cPtr->saved = cPtr->current;
cPtr->haveSaved = TRUE;
cPtr->savedNumFonts = numFonts;
- cPtr->savedName = (char *) pFontInfo;
+ if (cPtr->savedName)
+ fsfree(cPtr->savedName);
+ cPtr->savedName = (char *)fsalloc(namelen + 1);
+ if (cPtr->savedName)
+ memmove(cPtr->savedName, name, namelen + 1);
aliascount = 20;
}
memmove(cPtr->current.pattern, name, namelen);
@@ -1319,6 +1323,7 @@ bail:
for (i = 0; i < cPtr->num_fpes; i++)
FreeFPE(cPtr->fpe_list[i]);
fsfree(cPtr->fpe_list);
+ if (cPtr->savedName) fsfree(cPtr->savedName);
fsfree(cPtr->reply);
fsfree(cPtr);
return TRUE;
@@ -1370,6 +1375,7 @@ StartListFontsWithInfo(
c->savedNumFonts = 0;
c->haveSaved = FALSE;
c->slept = FALSE;
+ c->savedName = 0;
do_list_fonts_with_info(client, (pointer) c);
return TRUE;
badAlloc:
diff --git a/difs/resource.c b/difs/resource.c
index 5eaedb7..da28d7f 100644
--- a/difs/resource.c
+++ b/difs/resource.c
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
* %W% %G%
*
*/
-/* $XFree86: xc/programs/xfs/difs/resource.c,v 3.8 2002/10/15 01:45:02 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/resource.c,v 3.9 2003/05/27 22:27:06 tsi Exp $ */
/*
* a resource is a 32 bit quantity. the upper 12 bits are client id.
* client provides a 19 bit resource id. this is "hashed" by me by
@@ -99,7 +99,9 @@ typedef struct _ClientResource {
} ClientResourceRec;
static RESTYPE lastResourceType;
+#ifdef NOTYET
static RESTYPE lastResourceClass;
+#endif
static RESTYPE TypeMask;
typedef int (*DeleteType) (void *, FSID);
@@ -163,7 +165,9 @@ InitClientResources(ClientPtr client)
if (client == serverClient) {
lastResourceType = RT_LASTPREDEF;
+#ifdef NOTYET
lastResourceClass = RC_LASTPREDEF;
+#endif
TypeMask = RC_LASTPREDEF - 1;
if (DeleteFuncs)
fsfree(DeleteFuncs);
diff --git a/include/extentst.h b/include/extentst.h
index 56cb17b..3249c73 100644
--- a/include/extentst.h
+++ b/include/extentst.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
* @(#)extentst.h 4.1 91/05/02
*
*/
-/* $XFree86: xc/programs/xfs/include/extentst.h,v 1.6 2001/12/14 20:01:38 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/extentst.h,v 1.7 2003/07/16 01:39:17 dawes Exp $ */
#ifndef _EXTENTST_H_
#define _EXTENTST_H_
@@ -70,7 +70,7 @@ typedef struct _ExtensionEntry {
extern void (*EventSwapVector[]) (fsError *, fsError *);
#if 0
-typedef void (*ExtensionLookupProc) ();
+typedef void (*ExtensionLookupProc) (char *name, GCPtr pGC);
typedef struct _ProcEntry {
char *name;
@@ -78,7 +78,7 @@ typedef struct _ProcEntry {
} ProcEntryRec, *ProcEntryPtr;
extern ExtensionEntry *AddExtension();
-extern ExtensionLookupProc LookupProc();
+extern ExtensionLookupProc LookupProc(char *name, GCPtr pGC);
extern Bool RegisterProc();
#endif
diff --git a/os/access.c b/os/access.c
index 72488fd..83103da 100644
--- a/os/access.c
+++ b/os/access.c
@@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
* THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/xfs/os/access.c,v 3.7 2001/12/14 20:01:40 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/access.c,v 3.8 2003/07/09 15:27:40 tsi Exp $ */
#include <X11/Xos.h>
#ifndef Lynx
@@ -76,10 +76,12 @@ AccessSetConnectionLimit(int num)
MaxClients = num;
}
+#ifdef NOTDEF
/*
* XXX
*
* needs massive amounts of OS-dependent work (big surprise)
+ * needs IPv6 support as well
*/
int
GetHostAddress(HostAddress *addr)
@@ -102,6 +104,7 @@ GetHostAddress(HostAddress *addr)
}
return FSSuccess;
}
+#endif
/* ARGSUSED */
int
diff --git a/os/connection.c b/os/connection.c
index c980b11..d17de6d 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -67,8 +67,9 @@ in this Software without prior written authorization from The Open Group.
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
* THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/xfs/os/connection.c,v 3.25 2002/10/15 01:45:03 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/connection.c,v 3.26 2003/07/09 15:27:40 tsi Exp $ */
+#include <stdlib.h>
#include <X11/Xtrans.h>
#include <stdlib.h>
#include "misc.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 14:43:46 +0000