btr: Remove btr_free_node().

[paraslash.git] / client.c

diff --git a/client.c b/client.c
index 4998222ea7c89df98ad55879a08f9dea1b5f6c6b..6268c3de8892f921045e18f2f7e7560ada8c5083 100644 (file)
--- a/client.c
+++ b/client.c
@@ -114,11 +114,11 @@ static int execute_client_command(const char *cmd, char **result)
                goto out;
        schedule(&command_sched);
        *result = exec_task.result_buf;
-       btr_remove_node(exec_task.btrn);
+       btr_remove_node(&exec_task.btrn);
        client_disconnect(ct);
        ret = 1;
 out:
-       btr_free_node(exec_task.btrn);
+       btr_remove_node(&exec_task.btrn);
        if (ret < 0)
                free(exec_task.result_buf);
        return ret;
@@ -606,6 +606,7 @@ int main(int argc, char *argv[])
        if (ret >= 0 && ct->task.error < 0) {
                switch(ct->task.error) {
                /* these are not errors */
+               case -E_SERVER_CMD_SUCCESS:
                case -E_EOF:
                case -E_SERVER_EOF:
                case -E_BTR_EOF:
@@ -618,7 +619,7 @@ out:
        if (ret < 0)
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
        client_close(ct);
-       btr_free_node(sit.btrn);
-       btr_free_node(sot.btrn);
+       btr_remove_node(&sit.btrn);
+       btr_remove_node(&sot.btrn);
        return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }