dwindows: gtk3/dw.c comparison

comparison gtk3/dw.c @ 1106:eb6b27d17fe7

Fixed the 64bit warnings in GTK3.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 26 Jul 2011 09:32:50 +0000
parents	8e9db23a8c31
children	36773e04245c

comparison

equal deleted inserted replaced

-:e6511648c59e
+:eb6b27d17fe7
 GdkCursor *cursor;
 DW_MUTEX_LOCK;
 if(pointertype > 65535)
 {
-GdkPixbuf  *pixbuf = _find_pixbuf((HICN)pointertype, NULL, NULL);
+GdkPixbuf  *pixbuf = _find_pixbuf(GINT_TO_POINTER(pointertype), NULL, NULL);
 cursor = gdk_cursor_new_from_pixbuf(gdk_display_get_default(), pixbuf, 8, 8);
 }
 else if(!pointertype)
 cursor = NULL;
 else
 * Parameters:
 *          handle: Handle to icon returned by dw_icon_load().
 */
 void dw_icon_free(HICN handle)
 {
-int iicon = (int)handle;
+int iicon = GPOINTER_TO_INT(handle);
 if(iicon > 65535)
 {
 g_object_unref(handle);
 }
 while(1)
 {
 FD_ZERO(&rd);
 FD_SET(listenfd, &rd);
+int result;
 maxfd = listenfd;
 /* Added any connections to the named event semaphore */
 for(z=0;z<connectcount;z++)
 /* The semaphore has been posted so
 * we tell all the waiting threads to
 * continue.
 */
 if(array[s].waiting)
-write(array[s].fd, &tmp, 1);
+result = write(array[s].fd, &tmp, 1);
 }
 }
 break;
 case 2:
 /* Wait */
 array[z].waiting = 1;
 /* If we are posted exit immeditately */
 if(posted)
-write(array[z].fd, &tmp, 1);
+result = write(array[z].fd, &tmp, 1);
 }
 break;
 case 3:
 {
 /* Done Waiting */
 return NULL;
 }
 /* Create a thread to handle this event semaphore */
 pthread_create(&dwthread, NULL, (void *)_handle_sem, (void *)tmpsock);
-return (HEV)ev;
+return GINT_TO_POINTER(ev);
 }
 /* Open an already existing named event semaphore.
 * Parameters:
 *         eve: Pointer to an event handle to receive handle.
 un.sun_family=AF_UNIX;
 mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
 strcpy(un.sun_path, "/tmp/.dw/");
 strcat(un.sun_path, name);
 connect(ev, (struct sockaddr *)&un, sizeof(un));
-return (HEV)ev;
+return GINT_TO_POINTER(ev);
 }
 /* Resets the event semaphore so threads who call wait
 * on this semaphore will block.
 * Parameters:
 int dw_named_event_reset(HEV eve)
 {
 /* signal reset */
 char tmp = (char)0;
-if((int)eve < 0)
+if(GPOINTER_TO_INT(eve) < 0)
-return 0;
+return DW_ERROR_NONE;
-if(write((int)eve, &tmp, 1) == 1)
+if(write(GPOINTER_TO_INT(eve), &tmp, 1) == 1)
-return 0;
+return DW_ERROR_NONE;
-return 1;
+return DW_ERROR_GENERAL;
 }
 /* Sets the posted state of an event semaphore, any threads
 * waiting on the semaphore will no longer block.
 * Parameters:
 {
 /* signal post */
 char tmp = (char)1;
-if((int)eve < 0)
+if(GPOINTER_TO_INT(eve) < 0)
-return 0;
+return DW_ERROR_NONE;
-if(write((int)eve, &tmp, 1) == 1)
+if(write(GPOINTER_TO_INT(eve), &tmp, 1) == 1)
-return 0;
+return DW_ERROR_NONE;
-return 1;
+return DW_ERROR_GENERAL;
 }
 /* Waits on the specified semaphore until it becomes
 * posted, or returns immediately if it already is posted.
 * Parameters:
 fd_set rd;
 struct timeval tv, *useme;
 int retval = 0;
 char tmp;
-if((int)eve < 0)
+if(GPOINTER_TO_INT(eve) < 0)
 return DW_ERROR_NON_INIT;
 /* Set the timout or infinite */
 if(timeout == -1)
 useme = NULL;
 useme = &tv;
 }
 FD_ZERO(&rd);
-FD_SET((int)eve, &rd);
+FD_SET(GPOINTER_TO_INT(eve), &rd);
 /* Signal wait */
 tmp = (char)2;
-write((int)eve, &tmp, 1);
+retval = write(GPOINTER_TO_INT(eve), &tmp, 1);
-retval = select((int)eve+1, &rd, NULL, NULL, useme);
+if(retval == 1)
+retval = select(GPOINTER_TO_INT(eve)+1, &rd, NULL, NULL, useme);
 /* Signal done waiting. */
 tmp = (char)3;
-write((int)eve, &tmp, 1);
+if(retval == 1)
+retval = write(GPOINTER_TO_INT(eve), &tmp, 1);
 if(retval == 0)
 return DW_ERROR_TIMEOUT;
 else if(retval == -1)
 return DW_ERROR_INTERRUPT;
 /* Clear the entry from the pipe so
 * we don't loop endlessly. :)
 */
-read((int)eve, &tmp, 1);
+if(read(GPOINTER_TO_INT(eve), &tmp, 1) == 1)
-return 0;
+	return DW_ERROR_NONE;
+return DW_ERROR_GENERAL;
 }
 /* Release this semaphore, if there are no more open
 * handles on this semaphore the semaphore will be destroyed.
 * Parameters:
 int dw_named_event_close(HEV eve)
 {
 /* Finally close the domain socket,
 * cleanup will continue in _handle_sem.
 */
-close((int)eve);
+close(GPOINTER_TO_INT(eve));
-return 0;
+return DW_ERROR_NONE;
 }
 /*
 * Setup thread independent color sets.
 */
 {
 free(handle);
 return NULL;
 }
-ftruncate(handle->fd, size);
+if(ftruncate(handle->fd, size))
+{
+close(handle->fd);
+free(handle);
+return NULL;
+}
 /* attach the shared memory segment to our process's address space. */
 *dest = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, handle->fd, 0);
 if(*dest == MAP_FAILED)

Mercurial > dwindows

comparison gtk3/dw.c @ 1106:eb6b27d17fe7