From 3e7d922c792de164e7dab24a0c510f13445f5f33 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Fri, 21 Aug 2015 14:20:33 +0200 Subject: Code style --- Linux_C_12/cCrossCallWindows_121.c | 54 +++++++++++--------------------------- Linux_C_12/util_121.c | 4 +-- 2 files changed, 18 insertions(+), 40 deletions(-) diff --git a/Linux_C_12/cCrossCallWindows_121.c b/Linux_C_12/cCrossCallWindows_121.c index f0fbbfb..38ba9ca 100644 --- a/Linux_C_12/cCrossCallWindows_121.c +++ b/Linux_C_12/cCrossCallWindows_121.c @@ -853,46 +853,24 @@ void EvalCcRqGETWINDOWTEXT (CrossCallInfo *pcci) /* hwnd; textptr result. */ printf("EvalCcRqGETWINDOWTEXT\n"); window = GTK_WIDGET(pcci->p1); - if (GTK_IS_WINDOW(window)) - { + if (GTK_IS_WINDOW(window)) { title = gtk_window_get_title(GTK_WINDOW(window)); - } - else - { - if (GTK_IS_LABEL(window)) - { - title = gtk_label_get_text(GTK_LABEL(window)); - } - else - { - if (GTK_IS_BUTTON(window)) - { - title = gtk_button_get_label(GTK_BUTTON(window)); - } - else - { - if (GTK_IS_ENTRY(window)) - { - title = gtk_entry_get_text(GTK_ENTRY(window)); - } - else - { - if (GTK_IS_TEXT_VIEW(window)) - { - GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(window)); - GtkTextIter start, end; + } else if (GTK_IS_LABEL(window)) { + title = gtk_label_get_text(GTK_LABEL(window)); + } else if (GTK_IS_BUTTON(window)) { + title = gtk_button_get_label(GTK_BUTTON(window)); + } else if (GTK_IS_ENTRY(window)) { + title = gtk_entry_get_text(GTK_ENTRY(window)); + } else if (GTK_IS_TEXT_VIEW(window)) { + GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(window)); + GtkTextIter start, end; - gtk_text_buffer_get_start_iter(buffer, &start); - gtk_text_buffer_get_end_iter(buffer, &end); - title = gtk_text_buffer_get_text (buffer, &start, &end, gtk_true()); - } - else - { - printf("EvalCcRqSETWINDOWTITLE -> unknown widget type"); - } - } - } - } + gtk_text_buffer_get_start_iter(buffer, &start); + gtk_text_buffer_get_end_iter(buffer, &end); + title = gtk_text_buffer_get_text (buffer, &start, &end, gtk_true()); + } + else { + printf("EvalCcRqSETWINDOWTITLE -> unknown widget type"); } if (GTK_IS_BUTTON(window)) diff --git a/Linux_C_12/util_121.c b/Linux_C_12/util_121.c index 7d533aa..d633f64 100644 --- a/Linux_C_12/util_121.c +++ b/Linux_C_12/util_121.c @@ -164,11 +164,11 @@ CLEAN_STRING cleanstring (char *s) return NULL; } - result_clean_string = (CLEAN_STRING) rmalloc (sizeof (int) + rstrlen (s) +1); + result_clean_string = (CLEAN_STRING) rmalloc(sizeof(int) + rstrlen(s) + 1); result_clean_string->length = rstrlen (s); rsncopy (result_clean_string->characters, s, rstrlen (s) + 1); rprintf("%s", s); - rprintf("]\n"); + rprintf("]\n"); return result_clean_string; } /* cleanstring */ -- cgit v1.2.3