Attachment #209476 for bug #292189

View | Details | Raw Unified | Return to bug 292189
Collapse All | Expand All




# endif

# ifndef ARGP_EI
#  define ARGP_EI extern inline
# endif

ARGP_EI void
__argp_usage (__const struct argp_state *__state)
{
  __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
}

ARGP_EI int
__option_is_short (__const struct argp_option *__opt)
{
  if (__opt->flags & OPTION_DOC)
    return 0;

}

ARGP_EI int
__option_is_end (__const struct argp_option *__opt)
{
  return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
}




/* Defined here, in case a user is not inlining the definitions in
 * argp.h */
void
__argp_usage (__const struct argp_state *__state)
{
  __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
}

int
__option_is_short (__const struct argp_option *__opt) 
{
  if (__opt->flags & OPTION_DOC)
    return 0;

}

int
__option_is_end (__const struct argp_option *__opt) 
{
  return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
}

Return to bug 292189

Lines 560-576 Link Here

(-)argp-standalone-1.4-test2/argp.h.orig (-4 / +4 lines)
560	# endif	560	# endif
561		561
562	# ifndef ARGP_EI	562	# ifndef ARGP_EI
563	# define ARGP_EI extern __inline__	563	# define ARGP_EI extern inline
564	# endif	564	# endif
565		565
566	ARGP_EI void	566	ARGP_EI void
567	__argp_usage (__const struct argp_state *__state) __THROW	567	__argp_usage (__const struct argp_state *__state)
568	{	568	{
569	__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);	569	__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
570	}	570	}
571		571
572	ARGP_EI int	572	ARGP_EI int
573	__option_is_short (__const struct argp_option *__opt) __THROW	573	__option_is_short (__const struct argp_option *__opt)
574	{	574	{
575	if (__opt->flags & OPTION_DOC)	575	if (__opt->flags & OPTION_DOC)
576	return 0;	576	return 0;
Lines 582-588 Link Here
582	}	582	}
583		583
584	ARGP_EI int	584	ARGP_EI int
585	__option_is_end (__const struct argp_option *__opt) __THROW	585	__option_is_end (__const struct argp_option *__opt)
586	{	586	{
587	return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;	587	return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
588	}	588	}

Lines 1290-1302 Link Here

(-)argp-standalone-1.4-test2/argp-parse.c.orig (-3 / +3 lines)
1290	/* Defined here, in case a user is not inlining the definitions in	1290	/* Defined here, in case a user is not inlining the definitions in
1291	* argp.h */	1291	* argp.h */
1292	void	1292	void
1293	__argp_usage (__const struct argp_state *__state) __THROW	1293	__argp_usage (__const struct argp_state *__state)
1294	{	1294	{
1295	__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);	1295	__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
1296	}	1296	}
1297		1297
1298	int	1298	int
1299	__option_is_short (__const struct argp_option *__opt) __THROW	1299	__option_is_short (__const struct argp_option *__opt)
1300	{	1300	{
1301	if (__opt->flags & OPTION_DOC)	1301	if (__opt->flags & OPTION_DOC)
1302	return 0;	1302	return 0;
Lines 1310-1316 Link Here
1310	}	1310	}
1311		1311
1312	int	1312	int
1313	__option_is_end (__const struct argp_option *__opt) __THROW	1313	__option_is_end (__const struct argp_option *__opt)
1314	{	1314	{
1315	return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;	1315	return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
1316	}	1316	}