1 files changed, 6 insertions, 6 deletions

diff --git a/src/twm.c b/src/twm.c
index 1a6ae95..ee1a3cf 100644
--- a/src/twm.c
+++ b/src/twm.c
@@ -320,7 +320,7 @@ main(int argc, char *argv[])
     if (Home == NULL)
 	Home = "./";
 
-    HomeLen = strlen(Home);
+    HomeLen = (int)strlen(Home);
 
     NoClass.res_name = NoName;
     NoClass.res_class = NoName;
@@ -375,7 +375,7 @@ main(int argc, char *argv[])
     InfoLines = 0;
 
     /* for simplicity, always allocate NumScreens ScreenInfo struct pointers */
-    ScreenList = calloc (NumScreens, sizeof (ScreenInfo *));
+    ScreenList = calloc ((size_t)NumScreens, sizeof (ScreenInfo *));
     if (ScreenList == NULL)
     {
 	fprintf (stderr, "%s: Unable to allocate memory for screen list, exiting.\n",
@@ -927,7 +927,7 @@ sigHandler(int sig)
  * cleanup and exit twm
  */
 void
-Done(XtPointer client_data, XtSignalId *si)
+Done(XtPointer client_data, XtSignalId *si2)
 {
     if (dpy)
     {
@@ -948,7 +948,7 @@ Bool ErrorOccurred = False;
 XErrorEvent LastErrorEvent;
 
 static int
-TwmErrorHandler(Display *dpy, XErrorEvent *event)
+TwmErrorHandler(Display *dpy2, XErrorEvent *event)
 {
     LastErrorEvent = *event;
     ErrorOccurred = True;
@@ -957,13 +957,13 @@ TwmErrorHandler(Display *dpy, XErrorEvent *event)
 	event->error_code != BadWindow &&	/* watch for dead puppies */
 	(event->request_code != X_GetGeometry &&	 /* of all styles */
 	 event->error_code != BadDrawable))
-      XmuPrintDefaultErrorMessage (dpy, event, stderr);
+      XmuPrintDefaultErrorMessage (dpy2, event, stderr);
     return 0;
 }
 
 
 static int
-CatchRedirectError(Display *dpy, XErrorEvent *event)
+CatchRedirectError(Display *dpy2, XErrorEvent *event)
 {
     RedirectError = TRUE;
     LastErrorEvent = *event;