From 37696167b3f8d330f2f9f2a51f86394880601f0b Mon Sep 17 00:00:00 2001 From: Armaan Bhojwani Date: Sun, 9 May 2021 13:59:29 -0400 Subject: [PATCH] Fix style --- mmenu.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/mmenu.c b/mmenu.c index e5860bd..03d7bce 100644 --- a/mmenu.c +++ b/mmenu.c @@ -23,7 +23,6 @@ memfail(void) exit(4); } - static size_t memback(void *contents, size_t size, size_t nmemb, void *userp) { @@ -67,7 +66,7 @@ getmenu(char *date) curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0); curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk); - printf("INFO: Fetching wepage\n"); + printf("INFO: Fetching webpage\n"); res = curl_easy_perform(curl); free(url); @@ -120,15 +119,16 @@ getmenu(char *date) } void -dayback(Widget w, XtPointer client_data, XtPointer call_data) +dayback(Widget unused, XtPointer client_data, XtPointer call_data) { - Widget text_w = (Widget) client_data; + (void)unused; + Widget disp = (Widget) client_data; XmListCallbackStruct *list_cbs = (XmListCallbackStruct *) call_data; char *nl = getmenu(days[list_cbs->item_position - 1]); - XmTextReplace((Widget) text_w, 0, strlen(XmTextGetString(text_w)), nl); + XmTextReplace((Widget) disp, 0, strlen(XmTextGetString(disp)), nl); } -/* Convert an array of string to an array of compound strings */ +// Convert an array of string to an array of compound strings XmStringTable ArgvToXmStringTable (int argc, char **argv) { XmStringTable new = @@ -146,7 +146,7 @@ int main(int argc, char *argv[]) { // Initialize motif - Widget toplevel, rowcol, w, text_w; + Widget toplevel, rowcol, daysel, disp; XmStringTable strs; XtAppContext app; Arg args[5]; @@ -166,18 +166,15 @@ main(int argc, char *argv[]) XtSetArg(args[n], XmNeditable, False); n++; XtSetArg(args[n], XmNcolumns, 80); n++; XtSetArg(args[n], XmNcursorPositionVisible, False); n++; - text_w = XmCreateScrolledText(rowcol, "text", args, n); - XtManageChild(text_w); + disp = XmCreateScrolledText(rowcol, "text", args, n); + XtManageChild(disp); // Create day selector - strs = ArgvToXmStringTable (XtNumber (days), days); - w = XmCreateScrolledList(rowcol, "list", NULL, 0); - XtVaSetValues(w, - XmNitems, strs, - XmNitemCount, XtNumber (days), - NULL); - XtAddCallback(w, XmNbrowseSelectionCallback, dayback, (XtPointer) text_w); - XtManageChild(w); + strs = ArgvToXmStringTable (XtNumber(days), days); + daysel = XmCreateScrolledList(rowcol, "list", NULL, 0); + XtVaSetValues(daysel, XmNitems, strs, XmNitemCount, XtNumber(days), NULL); + XtAddCallback(daysel, XmNbrowseSelectionCallback, dayback, (XtPointer) disp); + XtManageChild(daysel); XtManageChild(rowcol); // Display everything -- 2.39.2