formatting

SVN revision: 72176
This commit is contained in:
Mike Blumenkrantz 2012-06-15 08:51:07 +00:00
parent a3e029c18e
commit a7d136e964
1 changed files with 314 additions and 308 deletions

View File

@ -109,7 +109,8 @@ struct _Ethumb_Client
DBusPendingCall *pending_start_service_by_name;
const char *unique_name;
DBusPendingCall *pending_new;
struct {
struct
{
Ethumb_Client_Connect_Cb cb;
void *data;
Eina_Free_Cb free_data;
@ -119,7 +120,8 @@ struct _Ethumb_Client
Eina_List *pending_gen;
DBusPendingCall *pending_clear;
DBusPendingCall *pending_setup;
struct {
struct
{
Ethumb_Client_Die_Cb cb;
void *data;
Eina_Free_Cb free_data;
@ -245,6 +247,7 @@ __dbus_iter_type_check(int type, int expected, const char *expected_name)
return 0;
}
#define _dbus_iter_type_check(t, e) __dbus_iter_type_check(t, e, #e)
#define CHECK_NULL_RETURN(ptr, ...) \
@ -376,8 +379,8 @@ _ethumb_client_name_owner_changed(void *data, DBusMessage *msg)
return;
}
if(!from || !name)
return ;
if (!from || !name)
return;
if (strcmp(name, _ethumb_dbus_bus_name) != 0)
return;
@ -389,7 +392,7 @@ _ethumb_client_name_owner_changed(void *data, DBusMessage *msg)
if (client->unique_name && strcmp(client->unique_name, from) != 0)
WRN("%s was not the known name %s, ignored.",
from, client->unique_name);
else if(client->unique_name)
else if (client->unique_name)
{
ERR("server exit!!!");
if (client->die.cb)
@ -521,7 +524,7 @@ _ethumb_client_start_server_cb(void *data, DBusMessage *msg, DBusError *err)
return;
error:
error:
ERR("failed to start Ethumbd DBus service by its name.");
_ethumb_client_report_connect(client, 0);
}
@ -610,7 +613,7 @@ _ethumb_client_exists_end(void *data, Ecore_Thread *thread __UNUSED__)
tmp = cb->client->ethumb;
cb->client->ethumb = cb->dup;
cb->exists_cb((void*) cb->data,
cb->exists_cb((void *)cb->data,
cb->client, cb,
ethumb_exists(cb->client->ethumb));
@ -1264,6 +1267,7 @@ end:
pending->free_data(pending->data);
free(pending);
}
/**
* @endcond
*/
@ -1373,6 +1377,7 @@ _ethumb_client_queue_clear_cb(void *data, DBusMessage *msg __UNUSED__, DBusError
client->pending_clear = NULL;
}
/**
* @endcond
*/
@ -2230,8 +2235,8 @@ ethumb_client_thumb_exists(Ethumb_Client *client, Ethumb_Client_Thumb_Exists_Cb
return cb;
on_error:
exists_cb((void*) data, client, NULL, EINA_FALSE);
on_error:
exists_cb((void *)data, client, NULL, EINA_FALSE);
if (async)
{
@ -2383,11 +2388,11 @@ _ethumb_client_thumb_finish(void *data,
if (success)
{
async->done(client, thumb_path, thumb_key, (void*) async->data);
async->done(client, thumb_path, thumb_key, (void *)async->data);
}
else
{
async->error(client, (void*) async->data);
async->error(client, (void *)async->data);
}
pending = eina_list_remove(pending, async);
@ -2400,7 +2405,7 @@ _ethumb_client_thumb_generate_idler(void *data __UNUSED__)
Ethumb_Client_Async *async;
Eina_List *l1, *l2;
EINA_LIST_FOREACH_SAFE(idle_tasks[1], l1, l2, async)
EINA_LIST_FOREACH_SAFE (idle_tasks[1], l1, l2, async)
{
Ethumb *tmp;
@ -2412,7 +2417,7 @@ _ethumb_client_thumb_generate_idler(void *data __UNUSED__)
async->id = ethumb_client_generate(async->client, _ethumb_client_thumb_finish, async, NULL);
if (async->id == -1)
{
async->error(async->client, (void*) async->data);
async->error(async->client, (void *)async->data);
async->client->ethumb = tmp;
_ethumb_client_async_free(async);
}
@ -2437,7 +2442,7 @@ _ethumb_client_thumb_exists(void *data, Ethumb_Client *client, Ethumb_Exists *re
Ethumb_Client_Async *async = data;
if (request == NULL)
return ;
return;
assert(async->exists == request);
@ -2450,7 +2455,7 @@ _ethumb_client_thumb_exists(void *data, Ethumb_Client *client, Ethumb_Exists *re
const char *thumb_key;
ethumb_client_thumb_path_get(client, &thumb_path, &thumb_key);
async->done(client, thumb_path, thumb_key, (void*) async->data);
async->done(client, thumb_path, thumb_key, (void *)async->data);
_ethumb_client_async_free(async);
}
else
@ -2468,7 +2473,7 @@ _ethumb_client_thumb_exists_idler(void *data __UNUSED__)
Ethumb_Client_Async *async;
Eina_List *l1, *l2;
EINA_LIST_FOREACH_SAFE(idle_tasks[0], l1, l2, async)
EINA_LIST_FOREACH_SAFE (idle_tasks[0], l1, l2, async)
{
Ethumb *tmp;
@ -2480,10 +2485,10 @@ _ethumb_client_thumb_exists_idler(void *data __UNUSED__)
async->exists = ethumb_client_thumb_exists(async->client, _ethumb_client_thumb_exists, async);
if (!async->exists)
{
async->error(async->client, (void*) async->data);
async->error(async->client, (void *)async->data);
async->client->ethumb = tmp;
_ethumb_client_async_free(async);
continue ;
continue;
}
async->client->ethumb = tmp;
@ -2511,7 +2516,7 @@ ethumb_client_thumb_async_get(Ethumb_Client *client,
async = malloc(sizeof (Ethumb_Client_Async));
if (!async)
{
error(client, (void*) data);
error(client, (void *)data);
return NULL;
}
@ -2568,3 +2573,4 @@ ethumb_client_thumb_async_cancel(Ethumb_Client *client, Ethumb_Client_Async *req
_ethumb_client_async_free(request);
}