Convert uses of XKeycodeToKeysym (deprecated) to XkbKeycodeToKeysym

[oweals/cde.git] / cde / lib / DtSvc / DtEncap / spc-xt.c

diff --git a/cde/lib/DtSvc/DtEncap/spc-xt.c b/cde/lib/DtSvc/DtEncap/spc-xt.c
index bc4dd69a3faa47959832d305d947df35b6596ef6..d1a935e648f9dbaae941c92ee7c087236c43b48b 100644 (file)
--- a/cde/lib/DtSvc/DtEncap/spc-xt.c
+++ b/cde/lib/DtSvc/DtEncap/spc-xt.c
@@ -1,3 +1,25 @@
+/*
+ * CDE - Common Desktop Environment
+ *
+ * Copyright (c) 1993-2012, The Open Group. All rights reserved.
+ *
+ * These libraries and programs are free software; you can
+ * redistribute them and/or modify them under the terms of the GNU
+ * Lesser General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * These libraries and programs are distributed in the hope that
+ * they will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with these libraries and programs; if not, write
+ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110-1301 USA
+ */
 /*
  * File:         spc-xt.c $TOG: spc-xt.c /main/6 1998/03/16 14:41:02 mgreess $
  * Language:     C
@@ -49,7 +71,7 @@ static int SPC_AddInput(int                   source,
   if (SPC_Fd_Mapping == NULL) {
     SPC_Fd_Mapping = (SPC_Callback_Struct **) 
                     XeMalloc (FD_SETSIZE * sizeof (SPC_Callback_Struct *));
-    memset(SPC_Fd_Mapping, NULL, FD_SETSIZE * sizeof(SPC_Callback_Struct *));
+    memset(SPC_Fd_Mapping, 0, FD_SETSIZE * sizeof(SPC_Callback_Struct *));
   }
   structptr=SPC_LOOKUP_FD_MAPPING(source);
 
@@ -90,7 +112,7 @@ static SbInputId SPC_RemoveInput(int                          source,
   if (SPC_Fd_Mapping == NULL) {
     SPC_Fd_Mapping = (SPC_Callback_Struct **) 
                     XeMalloc (FD_SETSIZE * sizeof (SPC_Callback_Struct *));
-    memset(SPC_Fd_Mapping, NULL, FD_SETSIZE * sizeof(SPC_Callback_Struct *));
+    memset(SPC_Fd_Mapping, 0, FD_SETSIZE * sizeof(SPC_Callback_Struct *));
   }
   structptr=SPC_LOOKUP_FD_MAPPING(source);
   _DtSvcProcessUnlock();
@@ -107,11 +129,12 @@ static SbInputId SPC_RemoveInput(int                       source,
     
   }
 
-  return NULL;
+  return 0;
 }
   
 /*-----------------------------------------------------------------------+*/
-static SPC_Select(void )
+static int
+SPC_Select(void )
 /*-----------------------------------------------------------------------+*/
 {
     break_on_termination=TRUE;