erase unreachable code 05/193505/3
authorJunkyeong Kim <jk0430.kim@samsung.com>
Wed, 21 Nov 2018 08:55:41 +0000 (17:55 +0900)
committerJunkyeong Kim <jk0430.kim@samsung.com>
Thu, 22 Nov 2018 04:52:56 +0000 (13:52 +0900)
Change-Id: I67ac16533a0261ed62bb2591ae783e80f74c2e7e
Signed-off-by: Junkyeong Kim <jk0430.kim@samsung.com>
backends/virtual/tdm_virtual_display.c
client/tdm_client.c
src/tdm_server.c

index 3f9d9b5..1f1cc06 100644 (file)
@@ -819,13 +819,8 @@ virtual_output_create(tdm_backend_data *bdata, const char *name, tdm_error *erro
        output_data->connector_type = TDM_OUTPUT_TYPE_Unknown;
        output_data->status = TDM_OUTPUT_CONN_STATUS_DISCONNECTED;
 
-       if (name) {
-               snprintf(voutput_data->name, TDM_NAME_LEN, "%s", name);
-               snprintf(output_data->name, TDM_NAME_LEN, "%s", name);
-       } else {
-               snprintf(voutput_data->name, TDM_NAME_LEN, "unknown");
-               snprintf(output_data->name, TDM_NAME_LEN, "%s", name);
-       }
+       snprintf(voutput_data->name, TDM_NAME_LEN, "%s", name);
+       snprintf(output_data->name, TDM_NAME_LEN, "%s", name);
 
        output_data->timer = tdm_event_loop_add_timer_handler(virtual_data->dpy,
                                                                                                                  _tdm_virtual_display_cb_timeout,
@@ -860,7 +855,6 @@ virtual_output_create(tdm_backend_data *bdata, const char *name, tdm_error *erro
        return voutput_data;
 
 create_fail:
-       if (layer_data) free(layer_data);
        if (output_data) free(output_data);
        if (voutput_data->output_modes) free(voutput_data->output_modes);
        if (voutput_data) free(voutput_data);
@@ -930,8 +924,6 @@ virtual_output_get_output(tdm_voutput *voutput, tdm_error *error)
 {
        tdm_virtual_voutput_data *voutput_data = voutput;
 
-       RETURN_VAL_IF_FAIL(voutput_data, NULL);
-
        if (!voutput_data) {
                if (error) *error = TDM_ERROR_INVALID_PARAMETER;
                return NULL;
index 57f8ce3..d0aa6ea 100644 (file)
@@ -2147,8 +2147,6 @@ tdm_client_voutput_destroy(tdm_client_voutput *voutput)
                LIST_FOR_EACH_ENTRY_SAFE(cb, cbb, &private_voutput->buffer_list, link) {
                        tbm_surface_h tbm_surface = NULL;
 
-                       if (!cb) continue;
-
                        LIST_DEL(&cb->link);
 
                        tbm_surface = (tbm_surface_h)wl_buffer_get_user_data(cb->wl_buffer);
@@ -2328,8 +2326,6 @@ tdm_client_voutput_remove_commit_handler(tdm_client_voutput *voutput,
 
                LIST_DEL(&h->link);
                free(h);
-
-               pthread_mutex_unlock(&private_client->lock);
        }
 
        pthread_mutex_unlock(&private_client->lock);
index d1619d9..632e820 100644 (file)
@@ -1160,8 +1160,6 @@ tdm_voutput_cb_resource_destroy(struct wl_resource *resource)
        }
 
        LIST_FOR_EACH_ENTRY(vb, &voutput_info->buffer_list, link) {
-               if (!vb) continue;
-
                if (vb->wl_buffer)
                        wl_resource_destroy(vb->wl_buffer);
        }