X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcolor.c;h=7aa0d16c391c3e4b7c57fb1f18bda224178864fc;hp=96b0cc2714f119042dadc4d93e49abf0b78a6d28;hb=20e55d4252ca2db1fc2b1099acf8393c22903575;hpb=ca428dba4d56e2957319dfa70d939cec1a491b8f diff --git a/lib-ui/color.c b/lib-ui/color.c index 96b0cc2..7aa0d16 100644 --- a/lib-ui/color.c +++ b/lib-ui/color.c @@ -71,7 +71,7 @@ static COLOR_LINE *mutt_new_color_line (void) p->fg = p->bg = -1; - return (p); + return p; } static void mutt_free_color_line(COLOR_LINE ** l) @@ -117,7 +117,7 @@ parse_color_name (const char *s, int *col, int *attr, int brite, BUFFER * err) if ((*col = mutt_getvaluebyname (s, Colors)) == -1) { snprintf (err->data, err->dsize, _("%s: no such color"), s); - return (-1); + return -1; } return 0; @@ -134,18 +134,18 @@ int mutt_parse_uncolor(BUFFER *buf, BUFFER *s, unsigned long data, BUFFER if ((object = mutt_getvaluebyname (buf->data, Fields)) == -1) { snprintf (err->data, err->dsize, _("%s: no such object"), buf->data); - return (-1); + return -1; } if (m_strncmp(buf->data, "index", 5) != 0) { snprintf (err->data, err->dsize, _("%s: command valid only for index object"), "uncolor"); - return (-1); + return -1; } if (!MoreArgs (s)) { snprintf (err->data, err->dsize, _("%s: too few arguments"), "uncolor"); - return (-1); + return -1; } if (option(OPTNOCURSES)) { @@ -195,7 +195,7 @@ int mutt_parse_uncolor(BUFFER *buf, BUFFER *s, unsigned long data, BUFFER for (i = 0; Context && i < Context->msgcount; i++) Context->hdrs[i]->pair = 0; } - return (0); + return 0; } @@ -258,7 +258,7 @@ add_pattern (COLOR_LINE ** top, const char *s, int sensitive, (sensitive ? mutt_which_case (s) : REG_ICASE))) != 0) { regerror (r, &tmp->rx, err->data, err->dsize); mutt_free_color_line(&tmp); - return (-1); + return -1; } tmp->next = *top; tmp->pattern = m_strdup(s); @@ -301,7 +301,7 @@ parse_object (BUFFER * buf, BUFFER * s, int *o, int *ql, BUFFER * err) } else if ((*o = mutt_getvaluebyname (buf->data, Fields)) == -1) { snprintf (err->data, err->dsize, _("%s: no such object"), buf->data); - return (-1); + return -1; } return 0; @@ -313,23 +313,23 @@ parse_color_pair (BUFFER * buf, BUFFER * s, int *fg, int *bg, int *attr, { if (!MoreArgs (s)) { m_strcpy(err->data, err->dsize, _("color: too few arguments")); - return (-1); + return -1; } mutt_extract_token (buf, s, 0); if (parse_color_name (buf->data, fg, attr, A_BOLD, err) != 0) - return (-1); + return -1; if (!MoreArgs (s)) { m_strcpy(err->data, err->dsize, _("color: too few arguments")); - return (-1); + return -1; } mutt_extract_token (buf, s, 0); if (parse_color_name (buf->data, bg, attr, A_BLINK, err) != 0) - return (-1); + return -1; return 0; } @@ -347,7 +347,7 @@ parse_attr_spec (BUFFER * buf, BUFFER * s, int *fg, int *bg, int *attr, if (!MoreArgs (s)) { m_strcpy(err->data, err->dsize, _("mono: too few arguments")); - return (-1); + return -1; } mutt_extract_token (buf, s, 0); @@ -366,7 +366,7 @@ parse_attr_spec (BUFFER * buf, BUFFER * s, int *fg, int *bg, int *attr, *attr = A_NORMAL; /* needs use = instead of |= to clear other bits */ else { snprintf (err->data, err->dsize, _("%s: no such attribute"), buf->data); - return (-1); + return -1; } return 0; @@ -399,7 +399,7 @@ int mutt_parse_color(BUFFER *buf, BUFFER *s, unsigned long i, BUFFER *err) || object == MT_COLOR_INDEX) { if (!MoreArgs (s)) { m_strcpy(err->data, err->dsize, _("too few arguments")); - return (-1); + return -1; } mutt_extract_token (buf, s, 0); @@ -407,7 +407,7 @@ int mutt_parse_color(BUFFER *buf, BUFFER *s, unsigned long i, BUFFER *err) if (MoreArgs (s)) { m_strcpy(err->data, err->dsize, _("too many arguments")); - return (-1); + return -1; } if (option(OPTNOCURSES)) @@ -418,7 +418,7 @@ int mutt_parse_color(BUFFER *buf, BUFFER *s, unsigned long i, BUFFER *err) && use_default_colors () != OK) { m_strcpy(err->data, err->dsize, _("default colors not supported")); - return (-1); + return -1; } if (object == MT_COLOR_HEADER) @@ -455,5 +455,5 @@ int mutt_parse_color(BUFFER *buf, BUFFER *s, unsigned long i, BUFFER *err) if (object == MT_COLOR_NORMAL) BKGDSET(main_w, MT_COLOR_NORMAL); - return (r); + return r; }