summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2014-06-22 20:53:12 +0400
committerCyrill Gorcunov <gorcunov@gmail.com>2014-06-29 00:52:54 +0400
commit3ed32cb288e6a3bd2e3a4cc27152f593f7d3cee5 (patch)
tree7973774f6c7080aae6bfb91b6a9c58f9ef4e3870
parentdae24d75047d31e922880d68cac57a61948b010f (diff)
downloadnasm-3ed32cb288e6a3bd2e3a4cc27152f593f7d3cee5.tar.gz
nasm: Make op_type members being capitals
Otherwise they look like reguar variables. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
-rw-r--r--nasm.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/nasm.c b/nasm.c
index 5cf04a98..0ce0ba2a 100644
--- a/nasm.c
+++ b/nasm.c
@@ -129,11 +129,12 @@ static const struct forwrefinfo *forwref;
static struct preproc_ops *preproc;
enum op_type {
- op_normal, /* Preprocess and assemble */
- op_preprocess, /* Preprocess only */
- op_depend, /* Generate dependencies */
+ OP_NORMAL, /* Preprocess and assemble */
+ OP_PREPROCESS, /* Preprocess only */
+ OP_DEPEND, /* Generate dependencies */
};
static enum op_type operating_mode;
+
/* Dependency flags */
static bool depend_emit_phony = false;
static bool depend_missing_ok = false;
@@ -341,7 +342,7 @@ int main(int argc, char **argv)
forwrefs = saa_init((int32_t)sizeof(struct forwrefinfo));
preproc = &nasmpp;
- operating_mode = op_normal;
+ operating_mode = OP_NORMAL;
seg_init();
@@ -369,12 +370,12 @@ int main(int argc, char **argv)
/* define some macros dependent of command-line */
define_macros_late();
- depend_ptr = (depend_file || (operating_mode == op_depend)) ? &depend_list : NULL;
+ depend_ptr = (depend_file || (operating_mode == OP_DEPEND)) ? &depend_list : NULL;
if (!depend_target)
depend_target = quote_for_make(outname);
switch (operating_mode) {
- case op_depend:
+ case OP_DEPEND:
{
char *line;
@@ -391,7 +392,7 @@ int main(int argc, char **argv)
}
break;
- case op_preprocess:
+ case OP_PREPROCESS:
{
char *line;
char *file_name = NULL;
@@ -443,7 +444,7 @@ int main(int argc, char **argv)
}
break;
- case op_normal:
+ case OP_NORMAL:
{
/*
* We must call ofmt->filename _anyway_, even if the user
@@ -853,7 +854,7 @@ static bool process_arg(char *p, char *q)
case 'e': /* preprocess only */
case 'E':
- operating_mode = op_preprocess;
+ operating_mode = OP_PREPROCESS;
break;
case 'a': /* assemble only - don't preprocess */
@@ -900,10 +901,10 @@ set_warning:
case 'M':
switch (p[2]) {
case 0:
- operating_mode = op_depend;
+ operating_mode = OP_DEPEND;
break;
case 'G':
- operating_mode = op_depend;
+ operating_mode = OP_DEPEND;
depend_missing_ok = true;
break;
case 'P':