On Sat, Dec 27, 2008 at 08:20:43AM +0000, Frans Pop wrote:
> Author: fjp
> Date: Sat Dec 27 08:20:42 2008
> New Revision: 56984
>
> Log:
> Factor out function to convert debconf priorities
>
> Modified:
> trunk/packages/main-menu/main-menu.c
>
> Modified: trunk/packages/main-menu/main-menu.c
> ==============================================================================
> --- trunk/packages/main-menu/main-menu.c (original)
> +++ trunk/packages/main-menu/main-menu.c Sat Dec 27 08:20:42 2008
> @@ -47,6 +47,31 @@
>
> static void modify_debconf_priority (int raise_or_lower);
>
> +static char *debconf_priorities[] =
> + {
> + "low",
> + "medium",
> + "high",
> + "critical"
> + };
> +
> +#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
> +static int debconf_to_pri (char *priority) {
> + int i;
> + int pri = -1;
> +
> + if (priority) {
> + for (i = 0; (size_t)i < ARRAY_SIZE(debconf_priorities); ++i) {
> + if (0 == strcmp(priority, debconf_priorities[i]) ) {
> + pri = i;
> + break;
> + }
> + }
> + }
> +
> + return pri;
> +}
Purely stylist comment: "pri" could be entirely avoided by replacing the inner if
content with "return i", and the fallback case with "return -1".
> + if (menu_pri == -1)
> + debconf_to_pri(MENU_PRIORITY);
This last line surely should have been:
menu_pri = debconf_to_pri(MENU_PRIORITY);
But it was replaced in r56986, so this probably does not matter much.
> […]
Cheers,
--
Jérémy Bobbio .''`.
lunar@debian.org : :Ⓐ : # apt-get install anarchism
`. `'`
`-
Attachment:
signature.asc
Description: Digital signature