Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/include
Modified Files:
evfs.h evfs_misc.h
Added Files:
evfs_event.h evfs_server.h
Log Message:
* Header cleanup
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/include/evfs.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- evfs.h 27 Dec 2005 11:44:37 -0000 1.32
+++ evfs.h 10 Jan 2006 07:54:23 -0000 1.33
@@ -46,198 +46,9 @@
}
EfsdFsOps;
-
-
-typedef struct evfs_server evfs_server;
-struct evfs_server {
- Ecore_Hash* client_hash;
- Ecore_Hash* plugin_uri_hash;
- Ecore_Ipc_Server* ipc_server;
- unsigned long clientCounter;
-
- Ecore_List* incoming_command_list;
-
- int num_clients;
-};
-
-typedef struct evfs_command_client {
- evfs_client* client;
- evfs_command* command;
-} evfs_command_client;
-
-
-
-
-
-
-
-
-
-
-
-/*-----------*/
-
-/*This structure needs more development*/
-typedef struct evfs_auth_cache {
- char* path;
- char* username;
- char* password;
-} evfs_auth_cache;
-
-
-
-
-typedef struct evfs_file_monitor evfs_file_monitor;
-struct evfs_file_monitor {
- evfs_client* client;
- char* monitor_path;
-
- Ecore_File_Monitor *em;
-};
-
-
-/*Event structures*/
-typedef enum evfs_eventtype {
- EVFS_EV_REPLY = 0,
- EVFS_EV_FILE_MONITOR = 1,
- EVFS_EV_NOTIFY_ID = 2,
- EVFS_EV_STAT = 3,
- EVFS_EV_DIR_LIST = 4,
- EVFS_EV_FILE_PROGRESS = 5,
- EVFS_EV_FILE_OPEN= 6,
- EVFS_EV_FILE_READ = 7
-} evfs_eventtype;
-
-typedef enum evfs_eventtype_sub {
- EVFS_EV_SUB_MONITOR_NOTIFY = 1
-} evfs_eventtype_sub;
-
-typedef enum evfs_eventpart {
- EVFS_EV_PART_TYPE = 1,
- EVFS_EV_PART_SUB_TYPE = 2,
- EVFS_EV_PART_FILE_MONITOR_TYPE = 3,
- EVFS_EV_PART_FILE_MONITOR_FILENAME = 4,
- EVFS_EV_PART_FILE_MONITOR_PLUGIN = 5,
- EVFS_EV_PART_DATA = 6,
- EVFS_EV_PART_STAT_SIZE = 7,
- EVFS_EV_PART_FILE_REFERENCE = 8,
- EVFS_EV_PART_FILE_REFERENCE_USERNAME = 9,
- EVFS_EV_PART_FILE_REFERENCE_PASSWORD = 10,
-
- EVFS_EV_PART_PROGRESS = 11,
-
- EVFS_COMMAND_EXTRA = 12,
- EVFS_COMMAND_TYPE = 13,
- EVFS_FILE_REFERENCE = 14,
- EVFS_FILE_REFERENCE_PASSWORD = 15,
- EVFS_FILE_REFERENCE_USERNAME = 16,
- EVFS_FILE_REFERENCE_FD = 17,
- EVFS_COMMAND_END = 18,
-
-
- EVFS_EV_PART_END = 1000
-} evfs_eventpart;
-
-typedef enum evfs_file_monitor_type {
- EVFS_FILE_EV_CREATE,
- EVFS_FILE_EV_CHANGE,
- EVFS_FILE_EV_REMOVE,
- EVFS_FILE_EV_REMOVE_DIRECTORY
-} evfs_file_monitor_type;
-
-
-/*-----------------------------------------------------------------*/
-typedef struct evfs_stat {
- int st_uid;
- int st_gid;
- int st_size;
- int ist_atime;
- int ist_mtime;
- int ist_ctime;
-
-} evfs_stat;
-
-typedef struct evfs_event_id_notify evfs_event_id_notify;
-struct evfs_event_id_notify {
-
- int id;
-};
-
-typedef struct evfs_event_file_monitor evfs_event_file_monitor;
-struct evfs_event_file_monitor {
-
- evfs_file_monitor_type fileev_type;
- char* plugin;
- char* filename;
- int filename_len;
-};
-
-typedef struct evfs_event_stat evfs_event_stat;
-struct evfs_event_stat {
- evfs_stat stat_obj;
-};
-
-typedef struct evfs_event_file_list evfs_event_file_list;
-struct evfs_event_file_list {
-
- Ecore_List* list; /*A list of evfs_filereference*/
-};
-
-typedef enum evfs_progress_type {
- EVFS_PROGRESS_TYPE_CONTINUE,
- EVFS_PROGRESS_TYPE_DONE
-} evfs_progress_type;
-
-typedef struct evfs_event_progress {
- char* file_from;
- char* file_to;
- double file_progress;
- evfs_progress_type type;
-} evfs_event_progress;
-
-typedef struct evfs_event_data {
- long size;
- char* bytes;
-} evfs_event_data;
-
-//Would be good if this could be a union -> but evfs_command changes size :( */
-typedef struct evfs_event {
- evfs_eventtype type;
- evfs_command resp_command;
-
- evfs_event_file_list file_list;
- evfs_event_id_notify id_notify;
- evfs_event_file_monitor file_monitor;
- evfs_event_stat stat;
- evfs_event_progress* progress;
-
- evfs_event_data data;
-}
-evfs_event;
-/*---------------------------------------------------------------------*/
-
-typedef struct evfs_connection evfs_connection;
-struct evfs_connection {
- Ecore_Ipc_Server* server;
- unsigned long id;
- void (*callback_func)(evfs_event* data);
- evfs_event* prog_event;
-};
-
-
-void evfs_cleanup_client(evfs_client* client);
-void evfs_disconnect(evfs_connection* connection);
-evfs_connection* evfs_connect(void (*callback_func)(evfs_event*));
-evfs_file_uri_path* evfs_parse_uri(char* uri);
-void evfs_handle_command(evfs_client* client, evfs_command* command);
-void evfs_handle_monitor_start_command(evfs_client* client, evfs_command*
command);
-
-unsigned long evfs_server_get_next_id(evfs_server* serve);
-
-char* evfs_filereference_to_string(evfs_filereference* ref);
-
-
-
+#include "evfs_event.h"
+#include "evfs_server.h"
+#include "evfs_misc.h"
#include "evfs_commands.h"
#include "evfs_cleanup.h"
#include "evfs_io.h"
@@ -245,7 +56,6 @@
#include "evfs_event_helper.h"
#include "evfs_server_handle.h"
#include "evfs_common.h"
-#include "evfs_misc.h"
#if HAVE___ATTRIBUTE__
#define __UNUSED__ __attribute__((unused))
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/include/evfs_misc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evfs_misc.h 27 Dec 2005 11:44:37 -0000 1.1
+++ evfs_misc.h 10 Jan 2006 07:54:23 -0000 1.2
@@ -1,6 +1,41 @@
#ifndef _EVFS_MISC_H_
#define _EVFS_MISC_H_
+typedef struct evfs_command_client {
+ evfs_client* client;
+ evfs_command* command;
+} evfs_command_client;
+
+/*-----------*/
+
+/*This structure needs more development*/
+typedef struct evfs_auth_cache {
+ char* path;
+ char* username;
+ char* password;
+} evfs_auth_cache;
+
+
+
+
+typedef struct evfs_file_monitor evfs_file_monitor;
+struct evfs_file_monitor {
+ evfs_client* client;
+ char* monitor_path;
+
+ Ecore_File_Monitor *em;
+};
+
Ecore_List* evfs_file_list_sort(Ecore_List* file_list);
+
+void evfs_cleanup_client(evfs_client* client);
+void evfs_disconnect(evfs_connection* connection);
+evfs_connection* evfs_connect(void (*callback_func)(evfs_event*));
+evfs_file_uri_path* evfs_parse_uri(char* uri);
+void evfs_handle_command(evfs_client* client, evfs_command* command);
+void evfs_handle_monitor_start_command(evfs_client* client, evfs_command*
command);
+unsigned long evfs_server_get_next_id(evfs_server* serve);
+char* evfs_filereference_to_string(evfs_filereference* ref);
+
#endif
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
