Wireshark · Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] rev 39422: /trunk/gtk/ /trunk/gtk/: main_menubar.c

[Martin Mathieson <martin.r.mathieson@xxxxxxxxxxxxxx>]

On Fri, Oct 14, 2011 at 12:11 PM, Guy Harris <guy@xxxxxxxxxxxx> wrote:

On Oct 14, 2011, at 4:03 AM, martinm@xxxxxxxxxxxxx wrote:

> http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=39422
>
> User: martinm
> Date: 2011/10/14 04:03 AM
>
> Log:
> make_menu_items() isn't called without LUA support, so can't be static.

Yes, it can; the only reason it couldn't be static would be if it were called from outside gtk/main_menubar.c, which it doesn't appear to be.

Its definition might have to protected with the same #ifdef as its use(s), to avoid "defined but not used" warnings, but that's another matter.

Given that its only called from merge_lua_menu_items(), might make_menu_items() be too generic a function name?

I don't mind keeping the function static, but protecting the whole definition with #ifdef HAVE_LUA_5_1
While I'm at it shall I rename make_menu_items() to make_lua_menu_items()   ?

Martin