X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cde%2Fprograms%2Fdtstyle%2FKeyboard.c;h=e6a90da8eb231f6da90eefdc74a594dc02b9799a;hb=3503243d14aabccf09337dfd6b0133513d14d846;hp=cc19fae3183a376c0a1337c319b890c3576eccf9;hpb=83b6996daa2c5ae22fc2b69093814cb08314954a;p=oweals%2Fcde.git

diff --git a/cde/programs/dtstyle/Keyboard.c b/cde/programs/dtstyle/Keyboard.c
index cc19fae3..e6a90da8 100644
--- a/cde/programs/dtstyle/Keyboard.c
+++ b/cde/programs/dtstyle/Keyboard.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
+ */
 /************************************<+>*************************************
  ****************************************************************************
  **
@@ -20,6 +42,7 @@
 /* include files                         */
 /*+++++++++++++++++++++++++++++++++++++++*/
 
+#include <errno.h>
 #include <X11/Xlib.h>
 #include <Xm/MwmUtil.h>
 
@@ -145,9 +168,9 @@ build_keyboardDlg(
     XmString         string;
 
     /* Set up DialogBoxDialog button labels */
-    button_string[0] = CMPSTR(_DtOkString);
-    button_string[1] = CMPSTR(_DtCancelString);
-    button_string[2] = CMPSTR(_DtHelpString);
+    button_string[0] = CMPSTR((String) _DtOkString);
+    button_string[1] = CMPSTR((String) _DtCancelString);
+    button_string[2] = CMPSTR((String) _DtHelpString);
 
     /* Create toplevel DialogBox */
 
@@ -547,7 +570,7 @@ restoreKeybd(
     XrmValue value;
 
     xrm_name [0] = XrmStringToQuark ("keyboardDlg");
-    xrm_name [2] = NULL;
+    xrm_name [2] = 0;
 
     /* get x position */
     xrm_name [1] = XrmStringToQuark ("x");
@@ -612,7 +635,9 @@ saveKeybd(
         sprintf(bufr, "%s*keyboardDlg.x: %d\n", bufr, x);
         sprintf(bufr, "%s*keyboardDlg.y: %d\n", bufr, y);
 
-        write (fd, bufr, strlen(bufr));
+        if(-1 == write (fd, bufr, strlen(bufr))) {
+	    perror(strerror(errno));
+	}
     }
 }