Avoid creating implicit memcpy()s

diff --git a/src/hci/mucurses/print.c b/src/hci/mucurses/print.c
index dd9e299c21ce26489c911ca9e9d47e76ec52e4cb..fc14e67e01597a40b70e31da1fa2f5aa7915b6ca 100644 (file)
--- a/src/hci/mucurses/print.c
+++ b/src/hci/mucurses/print.c
@@ -56,11 +56,10 @@ static void _printw_handler ( struct printf_context *ctx, unsigned int c ) {
  * @ret rc     return status code
  */
 int vw_printw ( WINDOW *win, const char *fmt, va_list varglist ) {
-       struct printw_context wctx = {
-               .win = win,
-               .ctx = { .handler = _printw_handler, },
-       };
+       struct printw_context wctx;
 
+       wctx.win = win;
+       wctx.ctx.handler = _printw_handler;
        vcprintf ( &(wctx.ctx), fmt, varglist );
        return OK;
 }

diff --git a/src/hci/readline.c b/src/hci/readline.c
index 4fac098677fb26bfbc00edd5abddb568e1b955a0..420df648a68201dac5c008c9baf4c738348eff55 100644 (file)
--- a/src/hci/readline.c
+++ b/src/hci/readline.c
@@ -80,18 +80,18 @@ static void sync_console ( struct edit_string *string ) {
  */
 char * readline ( const char *prompt ) {
        char buf[READLINE_MAX];
-       struct edit_string string = {
-               .buf = buf,
-               .len = sizeof ( buf ),
-               .cursor = 0,
-       };
+       struct edit_string string;
        int key;
        char *line;
 
        if ( prompt )
                printf ( "%s", prompt );
 
+       memset ( &string, 0, sizeof ( string ) );
+       string.buf = buf;
+       string.len = sizeof ( buf );
        buf[0] = '\0';
+
        while ( 1 ) {
                key = edit_string ( &string, getkey() );
                sync_console ( &string );