From 5b16974db6dc32e989ec1b246f0d361ef03f7145 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 21 Dec 2014 10:53:04 -0800 Subject: [PATCH] maint: initialize an mbstate_t with "= { 0, };", rather than with memset I.e., use this: mbstate_t mbstate = { 0, }; rather than this: mbstate_t mbstate; memset (&cur_stat, 0, sizeof (mbstate_t)); Also, prefer "sizeof VAR" over sizeof(TYPE). * sed/execute.c (execute_program, translate_mb): As above. * sed/compile.c (match_slash, compile_program, normalize_text): Likewise. --- sed/compile.c | 14 +++++--------- sed/execute.c | 3 +-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/sed/compile.c b/sed/compile.c index e254d22..49c4fb2 100644 --- a/sed/compile.c +++ b/sed/compile.c @@ -504,15 +504,13 @@ match_slash (int slash, int regex) { struct buffer *b; int ch; - mbstate_t cur_stat; - - memset (&cur_stat, 0, sizeof (mbstate_t)); + mbstate_t cur_stat = { 0, }; /* We allow only 1 byte characters for a slash. */ if (BRLEN (slash, &cur_stat) == -2) bad_prog (BAD_DELIM); - memset (&cur_stat, 0, sizeof (mbstate_t)); + memset (&cur_stat, 0, sizeof cur_stat); b = init_buffer(); while ((ch = inchar()) != EOF && ch != '\n') @@ -1252,10 +1250,9 @@ compile_program(struct vector *vector) size_t *src_lens = MALLOC(len, size_t); char **trans_pairs; size_t mbclen; - mbstate_t cur_stat; + mbstate_t cur_stat = { 0, }; /* Enumerate how many character the source buffer has. */ - memset(&cur_stat, 0, sizeof(mbstate_t)); for (i = 0, j = 0; i < len;) { mbclen = MBRLEN (src_buf + i, len - i, &cur_stat); @@ -1269,7 +1266,7 @@ compile_program(struct vector *vector) } src_char_num = j; - memset(&cur_stat, 0, sizeof(mbstate_t)); + memset(&cur_stat, 0, sizeof cur_stat); idx = 0; /* trans_pairs = {src(0), dest(0), src(1), dest(1), ..., NULL} @@ -1370,8 +1367,7 @@ normalize_text(char *buf, size_t len, enum text_types buftype) int bracket_state = 0; int mbclen; - mbstate_t cur_stat; - memset(&cur_stat, 0, sizeof(mbstate_t)); + mbstate_t cur_stat = { 0, }; while (p < bufend) { diff --git a/sed/execute.c b/sed/execute.c index 27efa15..2e919f3 100644 --- a/sed/execute.c +++ b/sed/execute.c @@ -1201,8 +1201,7 @@ static void translate_mb (char *const *trans) { size_t idx; /* index in the input line. */ - mbstate_t mbstate; - memset(&mbstate, 0, sizeof(mbstate_t)); + mbstate_t mbstate = { 0, }; for (idx = 0; idx < line.length;) { unsigned int i;