Enlightenment CVS committal
Author : chaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/include
Modified Files:
evfs.h evfs_cleanup.h evfs_command.h evfs_commands.h
evfs_common.h evfs_event.h evfs_event_helper.h
evfs_filereference.h evfs_io.h evfs_metadata.h
evfs_metadata_db.h evfs_misc.h evfs_operation.h evfs_plugin.h
evfs_server.h evfs_server_handle.h
Log Message:
Phase 1 of EvfsIO rewrite/cleanup:
* evfs_filereference -> EvfsFilereference
* evfs_event -> EvfsEvent/hierarchy
* Simplified IO model for EET comms client<->server
* More sane accessor functions for command files
* More logical concatenation of structs to serve multiple purposes
* Speed improvements
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- evfs.h 11 Aug 2007 10:39:02 -0000 1.50
+++ evfs.h 16 Aug 2007 11:31:17 -0000 1.51
@@ -104,6 +104,7 @@
#include "evfs_event_helper.h"
#include "evfs_metadata.h"
#include "evfs_trash.h"
+#include "evfs_filereference.h"
void evfs_operation_user_dispatch(evfs_client * client, evfs_command * command,
evfs_operation * op, char* misc);
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_cleanup.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evfs_cleanup.h 6 Aug 2006 09:56:27 -0000 1.9
+++ evfs_cleanup.h 16 Aug 2007 11:31:17 -0000 1.10
@@ -7,12 +7,12 @@
EVFS_CLEANUP_PRESERVE_COMMAND
} evfs_free_state;
-void evfs_cleanup_filereference(evfs_filereference * ref);
+void evfs_cleanup_filereference(EvfsFilereference * ref);
void evfs_cleanup_command(evfs_command * command, int free_command);
void evfs_cleanup_file_command(evfs_command * command);
void evfs_cleanup_file_command_only(evfs_command* command);
void evfs_cleanup_file_monitor(evfs_file_monitor * mon);
-void evfs_cleanup_event(evfs_event *);
+void evfs_cleanup_event(EvfsEvent *);
void evfs_cleanup_file_uri_path(evfs_file_uri_path * path);
#endif
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_command.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- evfs_command.h 13 Aug 2007 03:05:21 -0000 1.16
+++ evfs_command.h 16 Aug 2007 11:31:17 -0000 1.17
@@ -40,18 +40,23 @@
char* ref;
char* ref2;
- evfs_filereference **files;
+ Evas_List* files;
}
evfs_command_file;
typedef struct evfs_command
{
evfs_command_type type;
- evfs_command_file file_command;
+ evfs_command_file* file_command;
struct evfs_operation *op;
long client_identifier;
}
evfs_command;
+
+EvfsFilereference* evfs_command_first_file_get(evfs_command* command);
+EvfsFilereference* evfs_command_second_file_get(evfs_command* command);
+EvfsFilereference* evfs_command_nth_file_get(evfs_command* command, int n);
+int evfs_command_file_count_get(evfs_command* command);
#endif
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_commands.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- evfs_commands.h 13 Aug 2007 03:05:21 -0000 1.22
+++ evfs_commands.h 16 Aug 2007 11:31:17 -0000 1.23
@@ -1,50 +1,50 @@
#ifndef __EVFS_COMMANDS_H_
#define __EVFS_COMMANDS_H_
-long evfs_monitor_add(evfs_connection * conn, evfs_filereference * ref);
-long evfs_monitor_remove(evfs_connection * conn, evfs_filereference * ref);
-long evfs_client_file_remove(evfs_connection * conn, evfs_filereference * ref);
-long evfs_client_file_rename(evfs_connection * conn, evfs_filereference * from,
- evfs_filereference * to);
-long evfs_client_file_stat(evfs_connection * conn, evfs_filereference * file);
-long evfs_client_dir_list(evfs_connection * conn, evfs_filereference * file);
-long evfs_client_file_open(evfs_connection * conn, evfs_filereference * file);
-long evfs_client_file_copy(evfs_connection * conn, evfs_filereference * from,
- evfs_filereference * to);
+long evfs_monitor_add(evfs_connection * conn, EvfsFilereference * ref);
+long evfs_monitor_remove(evfs_connection * conn, EvfsFilereference * ref);
+long evfs_client_file_remove(evfs_connection * conn, EvfsFilereference * ref);
+long evfs_client_file_rename(evfs_connection * conn, EvfsFilereference * from,
+ EvfsFilereference * to);
+long evfs_client_file_stat(evfs_connection * conn, EvfsFilereference * file);
+long evfs_client_dir_list(evfs_connection * conn, EvfsFilereference * file);
+long evfs_client_file_open(evfs_connection * conn, EvfsFilereference * file);
+long evfs_client_file_copy(evfs_connection * conn, EvfsFilereference * from,
+ EvfsFilereference * to);
long evfs_client_file_copy_multi(evfs_connection * conn, Ecore_List* files,
- evfs_filereference* to);
+ EvfsFilereference* to);
long
evfs_client_file_move_multi(evfs_connection * conn, Ecore_List* files,
- evfs_filereference* to);
+ EvfsFilereference* to);
long evfs_client_file_trash_restore(evfs_connection * conn, Ecore_List* files);
-long evfs_client_file_move(evfs_connection * conn, evfs_filereference * from,
- evfs_filereference * to);
-long evfs_client_file_read(evfs_connection * conn, evfs_filereference * file,
+long evfs_client_file_move(evfs_connection * conn, EvfsFilereference * from,
+ EvfsFilereference * to);
+long evfs_client_file_read(evfs_connection * conn, EvfsFilereference * file,
int read_size);
long evfs_client_operation_respond(evfs_connection * conn, long opid,
evfs_operation_response response);
-long evfs_client_directory_create(evfs_connection * conn, evfs_filereference *
file);
+long evfs_client_directory_create(evfs_connection * conn, EvfsFilereference *
file);
long
-evfs_client_metadata_retrieve(evfs_connection * conn, evfs_filereference* file
);
+evfs_client_metadata_retrieve(evfs_connection * conn, EvfsFilereference* file
);
long
-evfs_client_metadata_string_file_set(evfs_connection * conn,
evfs_filereference* file, char* key,char* value );
+evfs_client_metadata_string_file_set(evfs_connection * conn,
EvfsFilereference* file, char* key,char* value );
long
-evfs_client_metadata_string_file_get(evfs_connection * conn,
evfs_filereference* file, char* key );
+evfs_client_metadata_string_file_get(evfs_connection * conn,
EvfsFilereference* file, char* key );
long
evfs_client_metadata_groups_get(evfs_connection * conn);
long
-evfs_client_metadata_group_file_add(evfs_connection * conn,
evfs_filereference* ref, char* group);
+evfs_client_metadata_group_file_add(evfs_connection * conn, EvfsFilereference*
ref, char* group);
long
-evfs_client_metadata_group_file_remove(evfs_connection * conn,
evfs_filereference* ref, char* group);
+evfs_client_metadata_group_file_remove(evfs_connection * conn,
EvfsFilereference* ref, char* group);
long
-evfs_client_auth_send(evfs_connection* conn, evfs_filereference* ref, char*
user, char* password);
+evfs_client_auth_send(evfs_connection* conn, EvfsFilereference* ref, char*
user, char* password);
#endif
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_common.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evfs_common.h 6 Aug 2006 04:29:22 -0000 1.6
+++ evfs_common.h 16 Aug 2007 11:31:17 -0000 1.7
@@ -2,10 +2,11 @@
#define __EVFS_COMMON_H_
evfs_plugin *evfs_get_plugin_for_uri(evfs_server * server, char *uri_base);
-evfs_filereference* evfs_filereference_clone(evfs_filereference* source);
-int evfs_filereference_sanitise(evfs_filereference* ref);
+EvfsFilereference* EvfsFilereference_clone(EvfsFilereference* source);
+int EvfsFilereference_sanitise(EvfsFilereference* ref);
evfs_plugin* evfs_meta_plugin_get_for_type(evfs_server* server, char* mime);
-evfs_command* evfs_file_command_single_build(evfs_filereference* ref);
+evfs_command* evfs_file_command_single_build(EvfsFilereference* ref);
+void evfs_file_command_file_add(evfs_command* command, EvfsFilereference* ref);
#endif
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_event.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- evfs_event.h 14 Aug 2007 10:25:35 -0000 1.20
+++ evfs_event.h 16 Aug 2007 11:31:17 -0000 1.21
@@ -2,7 +2,7 @@
#define _EVFS_EVENT_H_
/*Event structures*/
-typedef enum evfs_eventtype
+typedef enum
{
EVFS_EV_REPLY = 0,
EVFS_EV_FILE_MONITOR = 1,
@@ -21,7 +21,7 @@
EVFS_EV_ERROR = 100,
EVFS_EV_NOT_SUPPORTED = 101
-} evfs_eventtype;
+} EvfsEventtype;
typedef enum evfs_eventtype_sub
{
@@ -59,17 +59,74 @@
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
+/*Reorg event*/
+typedef enum EvfsEventReturnCode
{
+ EVFS_RETURN_CODE_ERROR = 1,
+ EVFS_RETURN_CODE_SUCCESS = 0
+} EvfsEventReturnCode;
+
+#define EVFS_EVENT(event) ((EvfsEvent *) event)
+typedef struct {
+ EvfsEventtype type;
+ EvfsEventReturnCode retCode;
+ evfs_command* command;
+ int suffix; /*The start point of the suffix*/
+} EvfsEvent;
+
+typedef enum EvfsEventProgressType
+{
+ EVFS_PROGRESS_TYPE_CONTINUE,
+ EVFS_PROGRESS_TYPE_DONE
+} EvfsEventProgressType;
+
+#define EVFS_EVENT_PROGRESS(event) ((EvfsEventProgress *) event)
+typedef struct {
+ EvfsEvent base;
+ EvfsFilereference* from;
+ EvfsFilereference* to;
+ double progressAmt;
+ EvfsEventProgressType type;
+} EvfsEventProgress;
+
+#define EVFS_EVENT_DIR_LIST(event) ((EvfsEventDirList *) event)
+typedef struct {
+ EvfsEvent base;
+ Evas_List* files; /*A list of EvfsFileReference*/
+} EvfsEventDirList;
+
+typedef struct
+{
+ EvfsEvent base;
+ int id;
+} EvfsEventIdNotify;
+
+#define EVFS_EVENT_DATA(event) ((EvfsEventData *) event)
+typedef struct {
+ EvfsEvent base;
+ int size;
+ char* bytes;
+} EvfsEventData;
+
+#define EVFS_EVENT_METADATA(event) ((EvfsEventMetadata*) event)
+typedef struct {
+ EvfsEvent base;
+ Evas_List* meta_list;
+} EvfsEventMetadata;
+
+typedef struct
+{
+ char* key;
+ char* value;
+} EvfsMetaObject;
+
+#define EVFS_EVENT_STAT(event) ((EvfsEventStat*) event)
+typedef struct
+{
+ EvfsEvent base;
+ EvfsFilereference* file;
+
int st_mode;
int st_uid;
int st_gid;
@@ -78,110 +135,52 @@
int ist_mtime;
int ist_ctime;
-} evfs_stat;
-
-typedef struct evfs_meta_obj
-{
- char* key;
- char* value;
-} evfs_meta_obj;
-
-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;
- int filetype;
-};
-
-typedef struct evfs_event_stat evfs_event_stat;
-struct evfs_event_stat
-{
- evfs_stat stat_obj;
-};
+} EvfsEventStat;
-typedef struct evfs_event_file_list evfs_event_file_list;
-struct evfs_event_file_list
+#define EVFS_EVENT_METADATA_GROUPS(event) ((EvfsEventMetadataGroups *) event)
+typedef struct
{
+ EvfsEvent base;
+ Evas_List* string_list;
+} EvfsEventMetadataGroups;
- Ecore_List *list; /*A list of evfs_filereference */
-};
-
-typedef enum evfs_progress_type
+typedef enum EvfsEventFileMonitorType
{
- EVFS_PROGRESS_TYPE_CONTINUE,
- EVFS_PROGRESS_TYPE_DONE
-} evfs_progress_type;
+ EVFS_FILE_EV_CREATE,
+ EVFS_FILE_EV_CHANGE,
+ EVFS_FILE_EV_REMOVE,
+ EVFS_FILE_EV_REMOVE_DIRECTORY
+} EvfsEventFileMonitorType;
-typedef enum EvfsEventReturnCode
-{
- EVFS_RETURN_CODE_ERROR = 1,
- EVFS_RETURN_CODE_SUCCESS = 0
-} EvfsEventReturnCode;
+#define EVFS_EVENT_FILE_MONITOR(event) ((EvfsEventFileMonitor *) event)
+typedef struct
+{
+ EvfsEvent base;
+ EvfsEventFileMonitorType type;
-typedef struct evfs_event_progress
-{
- char *file_from;
- char *file_to;
- double file_progress;
- evfs_progress_type type;
-} evfs_event_progress;
+ EvfsFilereference* file;
+} EvfsEventFileMonitor;
-typedef struct evfs_event_data
+typedef struct
{
- long size;
- char *bytes;
-} evfs_event_data;
+ EvfsEvent base;
+} EvfsEventAuthFailure;
-typedef struct evfs_event_meta
+typedef struct
{
- Evas_List* meta_list;
- Ecore_Hash* meta_hash;
-} evfs_event_meta;
+ EvfsEvent base;
+} EvfsEventOpen;
-typedef struct evfs_event_misc
+#define EVFS_EVENT_OPERATION(event) ((EvfsEventOperation *) event)
+typedef struct
{
- Evas_List* string_list;
-} evfs_event_misc;
+ EvfsEvent base;
-//Would be good if this could be a union -> but evfs_command changes size :( */
-/*Looking to create a solution to this soon, using EET*/
-/*Either that, or just send serveral structs through the pipe*/
-typedef struct evfs_event
-{
- evfs_eventtype type;
- evfs_command resp_command;
- EvfsEventReturnCode retCode;
-
- evfs_event_file_list file_list;
- evfs_event_id_notify id_notify;
- evfs_event_file_monitor file_monitor;
- evfs_event_stat stat;
- evfs_event_misc misc;
-
- evfs_event_progress *progress;
- struct evfs_operation *op;
+ struct evfs_operation* operation;
+ char* misc;
+} EvfsEventOperation;
-
- /*This is just a hack until we separate out
- * the different evfs_event types into a struct
- * hierarchy */
- evfs_event_meta* meta;
-
- evfs_event_data data;
-}
-evfs_event;
-/*---------------------------------------------------------------------*/
+/*---------------*/
#endif
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_event_helper.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- evfs_event_helper.h 13 Aug 2007 03:05:21 -0000 1.19
+++ evfs_event_helper.h 16 Aug 2007 11:31:17 -0000 1.20
@@ -13,10 +13,10 @@
void evfs_list_dir_event_create(evfs_client * client, evfs_command * command,
Ecore_List * files);
void evfs_file_progress_event_create(evfs_client * client,
- evfs_filereference* prog_file1,
- evfs_filereference* prog_file2,
+ EvfsFilereference* prog_file1,
+ EvfsFilereference* prog_file2,
evfs_command * root_command,
- double progress, evfs_progress_type type);
+ double progress, EvfsEventProgressType
type);
void evfs_open_event_create(evfs_client * client, evfs_command * command);
void evfs_read_event_create(evfs_client * client, evfs_command * command,
char *bytes, long size);
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_filereference.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evfs_filereference.h 20 Jul 2006 15:15:41 -0000 1.6
+++ evfs_filereference.h 16 Aug 2007 11:31:17 -0000 1.7
@@ -30,12 +30,12 @@
char *token_s;
} evfs_uri_token;
-typedef struct evfs_filereference
+typedef struct EvfsFilereference
{
char *plugin_uri;
struct evfs_plugin *plugin;
- struct evfs_filereference *parent;
+ struct EvfsFilereference *parent;
struct evfs_server *server; /*The server that spawned/owns this fileref,
if any */
evfs_file_type file_type;
@@ -48,13 +48,15 @@
int fd; /*The file descriptor (if any) */
void *fd_p;
-} evfs_filereference;
+} EvfsFilereference;
typedef struct evfs_file_uri_path evfs_file_uri_path;
struct evfs_file_uri_path
{
int num_files;
- evfs_filereference **files;
+ EvfsFilereference **files;
};
+
+EvfsFilereference* evfs_filereference_new(char* plugin, char* path, int
filetype);
#endif
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_io.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- evfs_io.h 11 Aug 2007 10:39:03 -0000 1.13
+++ evfs_io.h 16 Aug 2007 11:31:17 -0000 1.14
@@ -46,8 +46,7 @@
ecore_ipc_message *ecore_ipc_message_new(int major, int minor, int ref,
int ref_to, int response, void *data,
int len);
-int evfs_process_incoming_command(evfs_server * server, evfs_command * command,
- ecore_ipc_message * message);
+evfs_command* evfs_process_incoming_command(evfs_server * server,
ecore_ipc_message * message);
void evfs_write_command_end(evfs_connection * conn);
void evfs_write_command(evfs_connection * conn, evfs_command * command);
void evfs_write_command_client(evfs_client * client, evfs_command * command);
@@ -61,8 +60,8 @@
void evfs_write_ecore_ipc_server_message(Ecore_Ipc_Server * server,
ecore_ipc_message * msg);
void evfs_write_event(evfs_client * client, evfs_command * command,
- evfs_event * event);
-int evfs_read_event(evfs_event * event, ecore_ipc_message * msg);
+ EvfsEvent * event);
+EvfsEvent* evfs_read_event(ecore_ipc_message * msg);
void
evfs_write_command_end(evfs_connection * conn);
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_metadata.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- evfs_metadata.h 11 Aug 2007 10:39:03 -0000 1.13
+++ evfs_metadata.h 16 Aug 2007 11:31:17 -0000 1.14
@@ -8,12 +8,11 @@
};
typedef struct _evfs_metadata_object evfs_metadata_object;
-struct _evfs_metadata_group_header {
+typedef struct {
char* name;
char* description;
char* visualhint;
-};
-typedef struct _evfs_metadata_group_header evfs_metadata_group_header;
+} EvfsMetadataGroup;
@@ -36,16 +35,16 @@
Eet_Data_Descriptor* _evfs_metadata_edd_create(char* desc, int size);
void evfs_metadata_debug_group_list_print();
int evfs_metadata_group_header_exists(char* group);
-void evfs_metadata_group_header_free(evfs_metadata_group_header* g);
+void evfs_metadata_group_header_free(EvfsMetadataGroup* g);
void evfs_metadata_file_groups_free(evfs_metadata_file_groups* groups);
void evfs_metadata_initialise(int);
void evfs_metadata_initialise_worker();
evfs_metadata_group* evfs_metadata_group_new(char* name, char* desc) ;
-void evfs_metadata_file_set_key_value_string(evfs_filereference* ref, char*
key,
+void evfs_metadata_file_set_key_value_string(EvfsFilereference* ref, char* key,
char* value);
-void evfs_metadata_group_header_file_add(evfs_filereference* ref, char* group);
-void evfs_metadata_group_header_file_remove(evfs_filereference* ref, char*
group);
-evfs_metadata_file_groups* evfs_metadata_file_groups_get(evfs_filereference*
ref);
+void evfs_metadata_group_header_file_add(EvfsFilereference* ref, char* group);
+void evfs_metadata_group_header_file_remove(EvfsFilereference* ref, char*
group);
+evfs_metadata_file_groups* evfs_metadata_file_groups_get(EvfsFilereference*
ref);
void evfs_metadata_debug_file_groups_print(evfs_metadata_file_groups* groups);
int evfs_metadata_file_groups_group_check(evfs_metadata_file_groups* groups,
char* group);
@@ -53,10 +52,10 @@
Evas_List* evfs_metadata_groups_get();
int evfs_metadata_extract_init();
-int evfs_metadata_extract_fork(evfs_filereference* ref);
+int evfs_metadata_extract_fork(EvfsFilereference* ref);
-char* evfs_metadata_file_get_key_value_string(evfs_filereference* ref, char*
key);
-void evfs_metadata_extract_queue(evfs_filereference* ref);
+char* evfs_metadata_file_get_key_value_string(EvfsFilereference* ref, char*
key);
+void evfs_metadata_extract_queue(EvfsFilereference* ref);
#endif
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_metadata_db.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evfs_metadata_db.h 26 Jun 2007 02:35:28 -0000 1.4
+++ evfs_metadata_db.h 16 Aug 2007 11:31:17 -0000 1.5
@@ -5,7 +5,7 @@
void evfs_metadata_db_init(sqlite3** db);
int evfs_metadata_db_version_bump(sqlite3* db, char* ver);
-int evfs_metadata_db_id_for_file(sqlite3* db, evfs_filereference* ref, int
create);
+int evfs_metadata_db_id_for_file(sqlite3* db, EvfsFilereference* ref, int
create);
void evfs_metadata_db_file_keyword_add(sqlite3* db, int file, char* key, char*
value);
void evfs_metadata_db_delete_file(sqlite3* db, int file);
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_misc.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evfs_misc.h 13 Aug 2007 12:56:58 -0000 1.12
+++ evfs_misc.h 16 Aug 2007 11:31:17 -0000 1.13
@@ -36,21 +36,21 @@
void evfs_cleanup_client(evfs_client * client);
void evfs_disconnect(evfs_connection * connection);
-evfs_connection *evfs_connect(void (*callback_func) (evfs_event *, void *),
+evfs_connection *evfs_connect(void (*callback_func) (EvfsEvent *, void *),
void *obj);
evfs_file_uri_path *evfs_parse_uri(char *uri);
-evfs_filereference * evfs_parse_uri_single(char *uri);
+EvfsFilereference * evfs_parse_uri_single(char *uri);
int 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);
+char *EvfsFilereference_to_string(EvfsFilereference * ref);
-int evfs_filereference_equal_is(evfs_filereference* file1, evfs_filereference*
file2);
+int EvfsFilereference_equal_is(EvfsFilereference* file1, EvfsFilereference*
file2);
-evfs_filereference* evfs_empty_file_get();
+EvfsFilereference* evfs_empty_file_get();
long libevfs_next_command_id_get();
evfs_command* evfs_client_command_new();
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_operation.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- evfs_operation.h 20 Aug 2006 04:13:56 -0000 1.17
+++ evfs_operation.h 16 Aug 2007 11:31:17 -0000 1.18
@@ -64,6 +64,7 @@
#define EVFS_OPERATION(op) ((evfs_operation*) op)
typedef struct evfs_operation evfs_operation;
+typedef struct evfs_operation EvfsOperation;
struct evfs_operation
{
evfs_operation_type type;
@@ -121,8 +122,8 @@
struct stat dest_stat;
int dest_stat_response;
- evfs_filereference* file_from;
- evfs_filereference* file_to;
+ EvfsFilereference* file_from;
+ EvfsFilereference* file_to;
int64 next_byte;
@@ -134,7 +135,7 @@
evfs_operation_task task;
struct stat file_stat;
- evfs_filereference* file;
+ EvfsFilereference* file;
};
typedef struct evfs_operation_task_file_remove evfs_operation_task_file_remove;
@@ -143,8 +144,8 @@
struct evfs_operation_task_mkdir {
evfs_operation_task task;
- evfs_filereference* from;
- evfs_filereference* file;
+ EvfsFilereference* from;
+ EvfsFilereference* file;
};
typedef struct evfs_operation_task_mkdir evfs_operation_task_mkdir;
@@ -159,10 +160,10 @@
void evfs_operation_wait_type_set(evfs_operation* op, int type);
void evfs_operation_response_handle(evfs_operation* op, evfs_operation_task*
task);
-void evfs_operation_copy_task_add(evfs_operation* op, evfs_filereference*
file_from,
- evfs_filereference* file_to, struct stat from_stat, struct stat
to_stat, int);
-void evfs_operation_mkdir_task_add(evfs_operation* op, evfs_filereference*
src, evfs_filereference* dir);
-void evfs_operation_remove_task_add(evfs_operation* op, evfs_filereference*
file, struct stat file_stat);
+void evfs_operation_copy_task_add(evfs_operation* op, EvfsFilereference*
file_from,
+ EvfsFilereference* file_to, struct stat from_stat, struct stat
to_stat, int);
+void evfs_operation_mkdir_task_add(evfs_operation* op, EvfsFilereference* src,
EvfsFilereference* dir);
+void evfs_operation_remove_task_add(evfs_operation* op, EvfsFilereference*
file, struct stat file_stat);
void evfs_operation_tasks_print(evfs_operation* op);
void evfs_operation_queue_pending_add(evfs_operation* op);
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_plugin.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- evfs_plugin.h 13 Aug 2007 03:05:21 -0000 1.19
+++ evfs_plugin.h 16 Aug 2007 11:31:17 -0000 1.20
@@ -12,7 +12,7 @@
typedef struct evfs_plugin_functions_vfolder
{
- void (*evfs_vfolder_list)(evfs_filereference* ref, Ecore_List** list);
+ void (*evfs_vfolder_list)(EvfsFilereference* ref, Ecore_List** list);
} evfs_plugin_functions_vfolder;
typedef struct evfs_plugin_functions
@@ -28,19 +28,19 @@
void (*evfs_dir_list) (evfs_client * client, evfs_command * command,
Ecore_List ** directory_list);
- int (*evfs_file_open) (evfs_client * client, evfs_filereference * command);
- int (*evfs_file_seek) (evfs_filereference * command, long offset,
+ int (*evfs_file_open) (evfs_client * client, EvfsFilereference * command);
+ int (*evfs_file_seek) (EvfsFilereference * command, long offset,
int whence);
- int (*evfs_file_read) (evfs_client * client, evfs_filereference * command,
+ int (*evfs_file_read) (evfs_client * client, EvfsFilereference * command,
char *bytes, long size);
- int (*evfs_file_write) (evfs_filereference * command, char *bytes,
+ int (*evfs_file_write) (EvfsFilereference * command, char *bytes,
long size);
- int (*evfs_file_close) (evfs_filereference * command);
+ int (*evfs_file_close) (EvfsFilereference * command);
- void (*evfs_file_notify_create) (evfs_filereference* file);
- int (*evfs_file_create) (evfs_filereference * file);
+ void (*evfs_file_notify_create) (EvfsFilereference* file);
+ int (*evfs_file_create) (EvfsFilereference * file);
- int (*evfs_file_mkdir) (evfs_filereference * file);
+ int (*evfs_file_mkdir) (EvfsFilereference * file);
void (*evfs_auth_push) (evfs_command* command);
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_server.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evfs_server.h 11 Aug 2007 10:39:03 -0000 1.6
+++ evfs_server.h 16 Aug 2007 11:31:17 -0000 1.7
@@ -6,8 +6,8 @@
{
Ecore_Ipc_Server *server;
unsigned long id;
- void (*callback_func) (evfs_event * data, void *obj);
- evfs_event *prog_event;
+ void (*callback_func) (EvfsEvent * data, void *obj);
+ EvfsEvent *prog_event;
void *obj;
};
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_server_handle.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- evfs_server_handle.h 13 Aug 2007 03:05:21 -0000 1.24
+++ evfs_server_handle.h 16 Aug 2007 11:31:17 -0000 1.25
@@ -1,10 +1,10 @@
#ifndef _EVFS_SERVER_HANDLE_H_
#define _EVFS_SERVER_HANDLE_H_
-int evfs_uri_open(evfs_client * client, evfs_filereference * uri);
-int evfs_uri_read(evfs_client * client, evfs_filereference * uri, char *bytes,
+int evfs_uri_open(evfs_client * client, EvfsFilereference * uri);
+int evfs_uri_read(evfs_client * client, EvfsFilereference * uri, char *bytes,
long size);
-int evfs_uri_close(evfs_client * client, evfs_filereference * uri);
+int evfs_uri_close(evfs_client * client, EvfsFilereference * uri);
void evfs_handle_monitor_start_command(evfs_client * client,
evfs_command * command);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
