Rename flags for clarity

log.c

@@ -578,10 +578,10 @@ int
 log_preinit(opts_t *opts)
 {
 	if (opts->contentlog) {
-		if (opts->contentlogdir) {
+		if (opts->contentlog_isdir) {
 			if (log_content_open_logdir(opts->contentlog) == -1)
 				goto out;
-		} else if (opts->contentlogspec) {
+		} else if (opts->contentlog_isspec) {
 			if (log_content_open_logspec(opts->contentlog) == -1)
 				goto out;
 		} else {

main.c

@@ -502,8 +502,8 @@ main(int argc, char *argv[])
 				opts->contentlog = strdup(optarg);
 				if (!opts->contentlog)
 					oom_die(argv0);
-				opts->contentlogdir = 0;
-				opts->contentlogspec = 0;
+				opts->contentlog_isdir = 0;
+				opts->contentlog_isspec = 0;
 				break;
 			case 'S':
 				if (opts->contentlog)
@@ -511,8 +511,8 @@ main(int argc, char *argv[])
 				opts->contentlog = strdup(optarg);
 				if (!opts->contentlog)
 					oom_die(argv0);
-				opts->contentlogdir = 1;
-				opts->contentlogspec = 0;
+				opts->contentlog_isdir = 1;
+				opts->contentlog_isspec = 0;
 				break;
 			case 'F':
 				if (opts->contentlog)
@@ -520,8 +520,8 @@ main(int argc, char *argv[])
 				opts->contentlog = strdup(optarg);
 				if (!opts->contentlog)
 					oom_die(argv0);
-				opts->contentlogdir = 0;
-				opts->contentlogspec = 1;
+				opts->contentlog_isdir = 0;
+				opts->contentlog_isspec = 1;
 				break;
 #ifdef HAVE_LOCAL_PROCINFO
 			case 'i':
@@ -619,7 +619,7 @@ main(int argc, char *argv[])
 			oom_die(argv0);
 	}
 	if (!opts->dropuser && !geteuid() && !getuid() &&
-	    !opts->contentlogdir && !opts->contentlogspec) {
+	    !opts->contentlog_isdir && !opts->contentlog_isspec) {
 		opts->dropuser = strdup("nobody");
 		if (!opts->dropuser)
 			oom_die(argv0);

opts.h

@@ -75,8 +75,8 @@ typedef struct opts {
 #endif /* SSL_OP_NO_TLSv1_2 */
 	unsigned int passthrough : 1;
 	unsigned int deny_ocsp : 1;
-	unsigned int contentlogdir : 1;
-	unsigned int contentlogspec : 1;
+	unsigned int contentlog_isdir : 1;
+	unsigned int contentlog_isspec : 1;
 #ifdef HAVE_LOCAL_PROCINFO
 	unsigned int lprocinfo : 1;
 #endif /* HAVE_LOCAL_PROCINFO */