Changeset 88712ad5e512167bcebb1e7e2aed736aead24078

Timestamp:

10/11/11 03:46:59 (20 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

6df7809837f5abf82df57c6f8cc01f41b2837648

Parents:

8ba2d5f991a2236ede2ccaed237bfb2baae6badd

git-author:

Nedko Arnaudov <nedko@arnaudov.name> / 2011-10-11T03:46:18Z+0300

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2011-10-11T03:46:59Z+0300

Message:

simplify ladish_room_save_project() error handling

the callback is always called. the function has not return value anymore.

Location:

daemon

Files:

• room.h (modified) (1 diff)
• room_save.c (modified) (5 diffs)

daemon/room.h

@@ -89 +89 @@
 typedef void (* ladish_room_save_complete_callback)(void * context, bool success);
 
-bool
+void
 ladish_room_save_project(
   ladish_room_handle room_handle,

daemon/room_save.c

@@ -317 +317 @@
 #undef ctx_ptr
 
-static bool ladish_room_save_project_do(struct ladish_room_save_context * ctx_ptr)
+static void ladish_room_save_project_do(struct ladish_room_save_context * ctx_ptr)
 {
   log_info("Saving project '%s' in room '%s' to '%s'", ctx_ptr->room->project_name, ctx_ptr->room->name, ctx_ptr->room->project_dir);
@@ -325 +325 @@
   if (!ensure_dir_exist(ctx_ptr->room->project_dir, 0777))
   {
-    goto fail;
+    ladish_room_save_complete(ctx_ptr, false);
   }
 
   ladish_app_supervisor_save(ctx_ptr->room->app_supervisor, ctx_ptr, ladish_room_apps_save_complete);
-
-  return true;
-
-fail:
-  ladish_room_save_complete(ctx_ptr, false);
-  return false;
 }
 
@@ -363 +357 @@
 #define room_ptr ((struct ladish_room *)room_handle)
 
-bool
+void
 ladish_room_save_project(
   ladish_room_handle room_handle,
@@ -384 +378 @@
   {
     log_error("malloc() failed to allocate memory for room save context struct");
-    goto fail;
+    ctx_ptr->callback(ctx_ptr->context, false);
+    return;
   }
 
@@ -472 +467 @@
   room_ptr->project_dir = ctx_ptr->project_dir;
 
-  return ladish_room_save_project_do(ctx_ptr);
+  ladish_room_save_project_do(ctx_ptr);
+  return;
 
 destroy_ctx:
-  ladish_room_save_context_destroy(ctx_ptr);
-fail:
-  return false;
+  ladish_room_save_complete(ctx_ptr, false);
 }