more const, attribute_noreturn saved 200 bytes

This commit is contained in:
"Vladimir N. Oleynik"
2005-10-19 09:21:51 +00:00
parent bb20462cb3
commit 5cf9a03b3f
2 changed files with 34 additions and 32 deletions

View File

@@ -63,10 +63,10 @@ typedef enum {BASH,TCSH} shell_t;
/* Some global variables that tells us how to parse. */
static shell_t shell=BASH; /* The shell we generate output for. */
static int quiet_errors=0; /* 0 is not quiet. */
static int quiet_output=0; /* 0 is not quiet. */
static int quiet_errors; /* 0 is not quiet. */
static int quiet_output; /* 0 is not quiet. */
static int quote=1; /* 1 is do quote. */
static int alternative=0; /* 0 is getopt_long, 1 is getopt_long_only */
static int alternative; /* 0 is getopt_long, 1 is getopt_long_only */
/* Function prototypes */
static const char *normalize(const char *arg);
@@ -192,9 +192,9 @@ int generate_output(char * argv[],int argc,const char *optstr,
return exit_code;
}
static struct option *long_options=NULL;
static int long_options_length=0; /* Length of array */
static int long_options_nr=0; /* Nr of used elements in array */
static struct option *long_options;
static int long_options_length; /* Length of array */
static int long_options_nr; /* Nr of used elements in array */
static const int LONG_OPTIONS_INCR = 10;
#define init_longopt() add_longopt(NULL,0)
@@ -285,7 +285,7 @@ void set_shell(const char *new_shell)
* 4) Returned for -T
*/
static struct option longopts[]=
static const struct option longopts[]=
{
{"options",required_argument,NULL,'o'},
{"longoptions",required_argument,NULL,'l'},
@@ -300,7 +300,7 @@ static struct option longopts[]=
};
/* Stop scanning as soon as a non-option argument is found! */
static const char *shortopts="+ao:l:n:qQs:Tu";
static const char shortopts[]="+ao:l:n:qQs:Tu";
int getopt_main(int argc, char *argv[])