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 442ad9a38e821257c7ea7f6e93605645e64a8bac..d1a935e648f9dbaae941c92ee7c087236c43b48b 100644 (file)
--- a/cde/lib/DtSvc/DtEncap/spc-xt.c
+++ b/cde/lib/DtSvc/DtEncap/spc-xt.c
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * 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
  */
@@ -71,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);
 
@@ -112,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();
@@ -129,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;