Enlightenment CVS committal

Author  : lordchaos
Project : e17
Module  : apps/efsd

Dir     : e17/apps/efsd/efsd


Modified Files:
        efsd_filetype.c efsd_io.c efsd_types.c libefsd.c 


Log Message:
Cleaned up some memory nastiness

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/efsd/efsd/efsd_filetype.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- efsd_filetype.c     14 May 2002 09:46:17 -0000      1.35
+++ efsd_filetype.c     9 Aug 2005 09:33:29 -0000       1.36
@@ -1332,7 +1332,7 @@
          }
       }
       break;
-    default:
+    default: ;
     }
 
   D_RETURN_(NULL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/efsd/efsd/efsd_io.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- efsd_io.c   9 Aug 2005 05:25:12 -0000       1.49
+++ efsd_io.c   9 Aug 2005 09:33:29 -0000       1.50
@@ -776,7 +776,12 @@
   D_ENTER;
 
   el = ecore_list_new();
-  ecore_list_append(el, ecore_ipc_message_new(3, 1, 
0,0,0,ee->efsd_filechange_event.file, strlen(ee->efsd_filechange_event.file)));
+  ecore_list_append(el, ecore_ipc_message_new(3, 1, 0,0,0,&ee->type, 
sizeof(EfsdEventType)));
+  ecore_list_append(el, ecore_ipc_message_new(3, 2, 
0,0,0,&ee->efsd_filechange_event.id, sizeof(EfsdCmdId)));
+  ecore_list_append(el, ecore_ipc_message_new(3, 3, 
0,0,0,&ee->efsd_filechange_event.changetype, sizeof(EfsdFilechangeType)));
+  ecore_list_append(el, ecore_ipc_message_new(3, 4, 
0,0,0,ee->efsd_filechange_event.file, strlen(ee->efsd_filechange_event.file)));
+  ecore_list_append(el, ecore_ipc_message_new(3, 100, 0, 0, 0, NULL, 0));
+
   /*iov->dat[iov->d] = strlen(ee->efsd_filechange_event.file) + 1;*/
 
   /*iov->vec[iov->v].iov_base   = &ee->type;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/efsd/efsd/efsd_types.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- efsd_types.c        9 Aug 2005 06:37:20 -0000       1.20
+++ efsd_types.c        9 Aug 2005 09:33:29 -0000       1.21
@@ -277,7 +277,7 @@
     {
     case EFSD_EVENT_REPLY:
       FREE(ev->efsd_reply_event.data);      
-      /*efsd_cmd_cleanup(&ev->efsd_reply_event.command); FIXME - uncomment*/ 
+      efsd_cmd_cleanup(&ev->efsd_reply_event.command);  
       break;
     case EFSD_EVENT_METADATA_CHANGE:
       FREE(ev->efsd_metachange_event.data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/efsd/efsd/libefsd.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- libefsd.c   9 Aug 2005 06:37:20 -0000       1.64
+++ libefsd.c   9 Aug 2005 09:33:29 -0000       1.65
@@ -124,6 +124,7 @@
    Ecore_Ipc_Event_Server_Data *e;
 
   /*printf("Received event from server..\n");*/
+   fflush(stdout);
 
    if ((e = (Ecore_Ipc_Event_Server_Data *) event))
    {
@@ -165,7 +166,7 @@
                        break;
        
                 case 2:
-                        /*printf ("it's an event!\n");*/
+                        /*printf ("it's a reply event!\n");*/
 
                        event = ecore_hash_get(partial_event_hash, e->server);
                        if (!event) {
@@ -198,14 +199,31 @@
                                                        
                                        }
 
+                                       ecore_hash_remove(partial_event_hash, 
e->server);
+                                       ecore_hash_remove(partial_command_hash, 
e->server);
+
+                                       printf("Command has %d files\n", 
event->efsd_reply_event.command.efsd_file_cmd.num_files);
+
                                        /*printf("Filename is (from ec): %s\n", 
event->efsd_reply_event.command.efsd_file_cmd.files[0]);*/
 
                                        if (event_cb) {
                                                (*event_cb)(event);
                                        }
+
+                                       
                                        break;
                                        
                        }
+                       break;
+
+               case 3: 
+                       printf("It's a filechange event\n");
+
+                       switch (e->minor) {
+                               case 100:
+                                       printf("It's a terminate, we have all 
our data\n");
+                                       break;
+                       }
                        
                         break;
         }




-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to