Browse Source

Avoid creating implicit memcpy()s

tags/v0.9.3
Michael Brown 18 years ago
parent
commit
d0a3cc3417
2 changed files with 8 additions and 9 deletions
  1. 3
    4
      src/hci/mucurses/print.c
  2. 5
    5
      src/hci/readline.c

+ 3
- 4
src/hci/mucurses/print.c View File

56
  * @ret rc	return status code
56
  * @ret rc	return status code
57
  */
57
  */
58
 int vw_printw ( WINDOW *win, const char *fmt, va_list varglist ) {
58
 int vw_printw ( WINDOW *win, const char *fmt, va_list varglist ) {
59
-	struct printw_context wctx = {
60
-		.win = win,
61
-		.ctx = { .handler = _printw_handler, },
62
-	};
59
+	struct printw_context wctx;
63
 
60
 
61
+	wctx.win = win;
62
+	wctx.ctx.handler = _printw_handler;
64
 	vcprintf ( &(wctx.ctx), fmt, varglist );
63
 	vcprintf ( &(wctx.ctx), fmt, varglist );
65
 	return OK;
64
 	return OK;
66
 }
65
 }

+ 5
- 5
src/hci/readline.c View File

80
  */
80
  */
81
 char * readline ( const char *prompt ) {
81
 char * readline ( const char *prompt ) {
82
 	char buf[READLINE_MAX];
82
 	char buf[READLINE_MAX];
83
-	struct edit_string string = {
84
-		.buf = buf,
85
-		.len = sizeof ( buf ),
86
-		.cursor = 0,
87
-	};
83
+	struct edit_string string;
88
 	int key;
84
 	int key;
89
 	char *line;
85
 	char *line;
90
 
86
 
91
 	if ( prompt )
87
 	if ( prompt )
92
 		printf ( "%s", prompt );
88
 		printf ( "%s", prompt );
93
 
89
 
90
+	memset ( &string, 0, sizeof ( string ) );
91
+	string.buf = buf;
92
+	string.len = sizeof ( buf );
94
 	buf[0] = '\0';
93
 	buf[0] = '\0';
94
+
95
 	while ( 1 ) {
95
 	while ( 1 ) {
96
 		key = edit_string ( &string, getkey() );
96
 		key = edit_string ( &string, getkey() );
97
 		sync_console ( &string );
97
 		sync_console ( &string );

Loading…
Cancel
Save