Menu
▾
▴
E CVS: proto pfritz
|
From: Enlightenment C. <no...@cv...> - 2007-07-25 17:06:04
|
Enlightenment CVS committal
Author : pfritz
Project : e17
Module : proto
Dir : e17/proto/ecore_dbus
Modified Files:
ecore_dbus.c ecore_dbus_address.c ecore_dbus_marshal.c
ecore_dbus_message.c ecore_dbus_object.c
ecore_dbus_unmarshal.c ecore_dbus_utils.c
Log Message:
*API BREAK* see the discussion in the mailing list. misc and e_modules will follow
===================================================================
RCS file: /cvs/e/e17/proto/ecore_dbus/ecore_dbus.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_dbus.c 11 Jul 2007 05:41:55 -0000 1.1
+++ ecore_dbus.c 25 Jul 2007 17:01:01 -0000 1.2
@@ -244,10 +244,10 @@
svr->auth_type = -1;
svr->auth_type_transaction = 0;
svr->messages = ecore_hash_new(ecore_direct_hash, ecore_direct_compare);
- ecore_hash_set_free_value(svr->messages, ECORE_FREE_CB(_ecore_dbus_message_free));
+ ecore_hash_free_value_cb_set(svr->messages, ECORE_FREE_CB(_ecore_dbus_message_free));
svr->objects = ecore_hash_new(ecore_str_hash, ecore_str_compare);
- ecore_hash_set_free_key(svr->objects, free);
- ecore_hash_set_free_value(svr->objects, ECORE_FREE_CB(ecore_dbus_object_free));
+ ecore_hash_free_key_cb_set(svr->objects, free);
+ ecore_hash_free_value_cb_set(svr->objects, ECORE_FREE_CB(ecore_dbus_object_free));
servers = _ecore_list2_append(servers, svr);
return svr;
@@ -551,13 +551,13 @@
ev->header.destination = ecore_dbus_message_header_field_get(msg, ECORE_DBUS_HEADER_FIELD_DESTINATION);
ev->header.sender = ecore_dbus_message_header_field_get(msg, ECORE_DBUS_HEADER_FIELD_SENDER);
ev->header.signature = ecore_dbus_message_header_field_get(msg, ECORE_DBUS_HEADER_FIELD_SIGNATURE);
- if (!ecore_list_is_empty(msg->fields))
+ if (!ecore_list_empty_is(msg->fields))
{
Ecore_DBus_Message_Field *f;
int i = 0;
- ev->args = malloc(ecore_list_nodes(msg->fields) * sizeof(Ecore_DBus_Message_Arg));
- ecore_list_goto_first(msg->fields);
+ ev->args = malloc(ecore_list_count(msg->fields) * sizeof(Ecore_DBus_Message_Arg));
+ ecore_list_first_goto(msg->fields);
while ((f = ecore_list_next(msg->fields)))
{
ev->args[i].type = f->type;
===================================================================
RCS file: /cvs/e/e17/proto/ecore_dbus/ecore_dbus_address.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_dbus_address.c 11 Jul 2007 05:41:55 -0000 1.1
+++ ecore_dbus_address.c 25 Jul 2007 17:01:01 -0000 1.2
@@ -30,9 +30,9 @@
if (!a) return NULL;
a->keys = ecore_list_new();
- ecore_list_set_free_cb(a->keys, _ecore_dbus_address_list_free_cb);
+ ecore_list_free_cb_set(a->keys, _ecore_dbus_address_list_free_cb);
a->vals = ecore_list_new();
- ecore_list_set_free_cb(a->vals, _ecore_dbus_address_list_free_cb);
+ ecore_list_free_cb_set(a->vals, _ecore_dbus_address_list_free_cb);
return a;
}
@@ -69,7 +69,7 @@
int error = 0;
alist = ecore_list_new();
- ecore_list_set_free_cb(alist, ECORE_FREE_CB(ecore_dbus_address_free));
+ ecore_list_free_cb_set(alist, ECORE_FREE_CB(ecore_dbus_address_free));
while(1)
{
@@ -144,13 +144,13 @@
char *s;
if (!key) return NULL;
- ecore_list_goto_first(address->keys);
+ ecore_list_first_goto(address->keys);
i = 0;
while((s = ecore_list_next(address->keys)))
{
if (!strcmp(key, s))
{
- return ecore_list_goto_index(address->vals, i);
+ return ecore_list_index_goto(address->vals, i);
}
i++;
}
@@ -168,8 +168,8 @@
snprintf(buf, PATH_MAX, "%s:", address->transport);
left -= strlen(address->transport) + 1;
- ecore_list_goto_first(address->keys);
- ecore_list_goto_first(address->vals);
+ ecore_list_first_goto(address->keys);
+ ecore_list_first_goto(address->vals);
while ((key = ecore_list_next(address->keys)) && (val = ecore_list_next(address->vals)))
{
char *encval;
@@ -192,7 +192,7 @@
ecore_dbus_address_list_connect(Ecore_List *addrs, const void *data)
{
Ecore_DBus_Address *addr;
- ecore_list_goto_first(addrs);
+ ecore_list_first_goto(addrs);
/* try each listed address in turn */
while ((addr = ecore_list_next(addrs)))
{
@@ -249,14 +249,14 @@
{
Ecore_DBus_Address *a;
- ecore_list_goto_first(addresses);
+ ecore_list_first_goto(addresses);
while((a = ecore_list_next(addresses)))
{
char *k, *v;
printf("Transport: %s\n", a->transport);
- ecore_list_goto_first(a->keys);
- ecore_list_goto_first(a->vals);
+ ecore_list_first_goto(a->keys);
+ ecore_list_first_goto(a->vals);
k = ecore_list_next(a->keys);
v = ecore_list_next(a->vals);
while (k || v)
===================================================================
RCS file: /cvs/e/e17/proto/ecore_dbus/ecore_dbus_marshal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_dbus_marshal.c 11 Jul 2007 05:41:55 -0000 1.1
+++ ecore_dbus_marshal.c 25 Jul 2007 17:01:01 -0000 1.2
@@ -108,7 +108,7 @@
void
_ecore_dbus_message_marshal_array_end(Ecore_DBus_Message *msg, Ecore_DBus_Message_Field_Array *arr)
{
- ecore_list_remove_first(msg->recurse);
+ ecore_list_first_remove(msg->recurse);
arr->end = msg->length;
*(unsigned int *)ECORE_DBUS_MESSAGE_FIELD(arr)->buffer = arr->end - arr->start;
}
@@ -121,7 +121,7 @@
printf("[ecore_dbus] marshal array %c\n", *contained_type);
arr = _ecore_dbus_message_marshal_array_begin(msg, *contained_type);
- ecore_list_goto_first(data);
+ ecore_list_first_goto(data);
while ((el = ecore_list_next(data)))
_ecore_dbus_message_marshal(msg, contained_type, el);
_ecore_dbus_message_marshal_array_end(msg, arr);
@@ -144,7 +144,7 @@
void
_ecore_dbus_message_marshal_struct_end(Ecore_DBus_Message *msg, Ecore_DBus_Message_Field_Struct *s __UNUSED__)
{
- ecore_list_remove_first(msg->recurse);
+ ecore_list_first_remove(msg->recurse);
}
Ecore_DBus_Message_Field_Variant *
@@ -163,7 +163,7 @@
_ecore_dbus_message_append_byte(msg, '\0');
f->value = _ecore_dbus_message_marshal(msg, (char *)&type, data);
- ecore_list_remove_first(msg->recurse);
+ ecore_list_first_remove(msg->recurse);
return f;
}
===================================================================
RCS file: /cvs/e/e17/proto/ecore_dbus/ecore_dbus_message.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_dbus_message.c 11 Jul 2007 05:41:55 -0000 1.1
+++ ecore_dbus_message.c 25 Jul 2007 17:01:01 -0000 1.2
@@ -262,7 +262,7 @@
_ecore_dbus_message_header_field_print(msg->header);
/* body fields */
printf("[ecore_dbus] body fields:\n");
- ecore_list_goto_first(msg->fields);
+ ecore_list_first_goto(msg->fields);
while ((f = ecore_list_next(msg->fields)))
_ecore_dbus_message_field_print(f);
}
@@ -273,7 +273,7 @@
{
Ecore_DBus_Message_Field_Container *s;
- ecore_list_goto_first(ECORE_DBUS_MESSAGE_FIELD_CONTAINER(m->header)->values);
+ ecore_list_first_goto(ECORE_DBUS_MESSAGE_FIELD_CONTAINER(m->header)->values);
while ((s = ecore_list_next(ECORE_DBUS_MESSAGE_FIELD_CONTAINER(m->header)->values)))
{
Ecore_DBus_Message_Field_Byte *b;
@@ -305,7 +305,7 @@
ecore_dbus_message_body_field_get(Ecore_DBus_Message *m, unsigned int pos)
{
Ecore_DBus_Message_Field *f;
- f = ecore_list_goto_index(m->fields, pos);
+ f = ecore_list_index_goto(m->fields, pos);
if (f)
return _ecore_dbus_message_field_value_get(f);
@@ -336,7 +336,7 @@
msg->buffer = calloc(msg->size, sizeof(unsigned char));
msg->all = ecore_list_new();
- ecore_list_set_free_cb(msg->all, _ecore_dbus_message_field_free);
+ ecore_list_free_cb_set(msg->all, _ecore_dbus_message_field_free);
msg->fields = ecore_list_new();
msg->recurse = ecore_list_new();
@@ -420,7 +420,7 @@
if (!f) return NULL;
f->type = type;
- if (!ecore_list_is_empty(msg->recurse))
+ if (!ecore_list_empty_is(msg->recurse))
{
Ecore_DBus_Message_Field_Container *c;
@@ -529,7 +529,7 @@
_ecore_dbus_message_marshal_array_end(msg, arr);
/* move the header fields to the header */
- msg->header = ecore_list_remove_last(msg->fields);
+ msg->header = ecore_list_last_remove(msg->fields);
/* pad to an 8 bit boundary */
_ecore_dbus_message_padding(msg, 8);
@@ -630,7 +630,7 @@
("[ecore_dbus] field ARRAY: value offset = %d length = %u\n",
f->offset, (unsigned int)*(f->buffer));
printf("[ecore_dbus] * ARRAY elements begin *\n");
- ecore_list_goto_first(c->values);
+ ecore_list_first_goto(c->values);
while ((s = ecore_list_next(c->values)))
_ecore_dbus_message_field_print(s);
printf("[ecore_dbus] * ARRAY elements end *\n");
@@ -646,7 +646,7 @@
("[ecore_dbus] field STRUCT: value offset = %d\n",
f->offset);
printf("[ecore_dbus] * STRUCT elements begin *\n");
- ecore_list_goto_first(c->values);
+ ecore_list_first_goto(c->values);
while ((s = ecore_list_next(c->values)))
_ecore_dbus_message_field_print(s);
printf("[ecore_dbus] * STRUCT elements end *\n");
@@ -696,7 +696,7 @@
"REPLY_SERIAL", "DESTINATION", "SENDER", "SIGNATURE"
};
- ecore_list_goto_first(arr->values);
+ ecore_list_first_goto(arr->values);
while ((s = ecore_list_next(arr->values)))
{
Ecore_DBus_Message_Field_Byte *b;
===================================================================
RCS file: /cvs/e/e17/proto/ecore_dbus/ecore_dbus_object.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_dbus_object.c 11 Jul 2007 05:41:55 -0000 1.1
+++ ecore_dbus_object.c 25 Jul 2007 17:01:01 -0000 1.2
@@ -65,7 +65,7 @@
}
printf("[ecore_dbus] got object %s\n", event->header.path);
- ecore_list_goto_first(obj->methods);
+ ecore_list_first_goto(obj->methods);
printf("[ecore_dbus] looking for method %s.%s\n", event->header.interface, event->header.member);
while((method = ecore_list_next(obj->methods)))
{
@@ -108,7 +108,7 @@
obj->server = server;
obj->path = strdup(path);
obj->methods = ecore_list_new();
- ecore_list_set_free_cb(obj->methods, ECORE_FREE_CB(_ecore_dbus_object_method_free));
+ ecore_list_free_cb_set(obj->methods, ECORE_FREE_CB(_ecore_dbus_object_method_free));
printf("[ecore_dbus] adding obj %d to key %s\n", (int)obj, path);
key = strdup(path);
ecore_hash_set(server->objects, key, obj);
===================================================================
RCS file: /cvs/e/e17/proto/ecore_dbus/ecore_dbus_unmarshal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_dbus_unmarshal.c 11 Jul 2007 05:41:55 -0000 1.1
+++ ecore_dbus_unmarshal.c 25 Jul 2007 17:01:01 -0000 1.2
@@ -195,7 +195,7 @@
_ecore_dbus_message_unmarshal_array_end(Ecore_DBus_Message *msg,
Ecore_DBus_Message_Field_Array *arr __UNUSED__)
{
- ecore_list_remove_first(msg->recurse);
+ ecore_list_first_remove(msg->recurse);
}
static void *
@@ -226,7 +226,7 @@
_ecore_dbus_message_unmarshal_struct_end(Ecore_DBus_Message *msg,
Ecore_DBus_Message_Field_Struct *s __UNUSED__)
{
- ecore_list_remove_first(msg->recurse);
+ ecore_list_first_remove(msg->recurse);
}
static void *
@@ -300,7 +300,7 @@
printf("[ecore_dbus] unknown/unhandled data type %c\n", type);
break;
}
- ecore_list_remove_first(msg->recurse);
+ ecore_list_first_remove(msg->recurse);
return f;
}
@@ -400,7 +400,7 @@
_ecore_dbus_message_unmarshal_struct_end(msg, s);
}
_ecore_dbus_message_unmarshal_array_end(msg, arr);
- msg->header = ecore_list_remove_first(msg->fields);
+ msg->header = ecore_list_first_remove(msg->fields);
sig = ecore_dbus_message_header_field_get(msg, ECORE_DBUS_HEADER_FIELD_SIGNATURE);
old_length = msg->length;
_ecore_dbus_message_padding_skip(msg, 8);
===================================================================
RCS file: /cvs/e/e17/proto/ecore_dbus/ecore_dbus_utils.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_dbus_utils.c 11 Jul 2007 05:41:55 -0000 1.1
+++ ecore_dbus_utils.c 25 Jul 2007 17:01:01 -0000 1.2
@@ -26,7 +26,7 @@
msg->size = size;
/* Update buffer references */
- ecore_list_goto_first(msg->all);
+ ecore_list_first_goto(msg->all);
while ((f = ecore_list_next(msg->all)))
f->buffer = msg->buffer + f->offset;
}
@@ -188,7 +188,7 @@
list = ecore_list_new();
c = ECORE_DBUS_MESSAGE_FIELD_CONTAINER(f);
- ecore_list_goto_first(c->values);
+ ecore_list_first_goto(c->values);
while ((value = ecore_list_next(c->values)))
ecore_list_append(list, _ecore_dbus_message_field_value_get(value));
return list;
|
