Vitezslav Samel <vitezslav(a)samel.cz> writes:
On Thu, May 03, 2012 at 03:04:26PM +0200, Nikola Pajkovsky wrote:
> Vitezslav Samel <vitezslav(a)samel.cz> writes:
>
> > Move all the *options() declarations into the options.h file.
> >
> > Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
> > ---
> > src/externs.h | 3 ---
> > src/options.h | 6 ++++++
> > 2 files changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/src/externs.h b/src/externs.h
> > index c9d047b..8e8f205 100644
> > --- a/src/externs.h
> > +++ b/src/externs.h
> > @@ -20,8 +20,5 @@ void servmon(char *iface, struct porttab *ports, const struct
OPTIONS *options,
> > void ip_host_breakdown(struct OPTIONS *options, char *iface);
> > void hostmon(const struct OPTIONS *options, int facilitytime, char *ifptr,
> > struct filterstate *ofilter);
> > -void setoptions(struct OPTIONS *options, struct porttab **ports);
> > -void loadoptions(struct OPTIONS *options);
> > -void saveoptions(struct OPTIONS *options);
> >
> > #endif /* IPTRAF_NG_EXTERNS_H */
> > diff --git a/src/options.h b/src/options.h
> > index a0dee10..f43c90b 100644
> > --- a/src/options.h
> > +++ b/src/options.h
> > @@ -12,4 +12,10 @@ struct OPTIONS {
> >
> > #define DEFAULT_UPDATE_DELAY 50000 /* usec screen delay if update rate 0 */
> >
> > +#include "serv.h"
>
> I'd like prefer to have #include's right after #ifndef XXX and #define XXX
I'd like too, but there is circular dependency between options.h and
serv.h. If you have nicer solution to this, I will fix it.
not good, not good. pathes are applied.
--
Nikola