misc trivial changes to please static analyzers

No functional changes.

Signed-off-by: Alberto Escolar Piedras <[email protected]>

Author: aescolar

common/src/main.c

@@ -121,8 +121,7 @@ int main(int argc, char *argv[])
 		nsi_hws_one_event();
 	}
 
-	/* This line should be unreachable */
-	return 1; /* LCOV_EXCL_LINE */
+	NSI_CODE_UNREACHABLE; /* LCOV_EXCL_LINE */
 }
 
 #endif /* NSI_NO_MAIN */

common/src/nce.c

@@ -53,7 +53,7 @@ NSI_INLINE int nce_sem_rewait(sem_t *semaphore)
 	int ret;
 
 	while ((ret = sem_wait(semaphore)) == EINTR) {
-		;
+		/* Restart wait if we were interrupted */
 	}
 	return ret;
 }

common/src/nct.c

@@ -147,18 +147,18 @@ NSI_INLINE int nct_sem_rewait(sem_t *semaphore)
 	int ret;
 
 	while ((ret = sem_wait(semaphore)) == EINTR) {
-		;
+		/* Restart wait if we were interrupted */
 	}
 	return ret;
 }
 
 /**
  * Helper function, run by a thread which is being aborted
  */
-static void abort_tail(struct threads_table_el *tt_el, int this_th_nbr)
+static void abort_tail(struct threads_table_el *tt_el)
 {
 	NCT_DEBUG("Thread [%i] %i: %s: Aborting (exiting) (rel mut)\n",
-		  tt_el->thead_cnt, this_th_nbr, __func__);
+		  tt_el->thead_cnt, tt_el->thread_idx, __func__);
 
 	tt_el->running = false;
 	tt_el->state = ABORTED;
@@ -183,7 +183,7 @@ static void nct_wait_until_allowed(struct threads_table_el *tt_el, int this_th_n
 	}
 
 	if (tt_el->state == ABORTING) {
-		abort_tail(tt_el, this_th_nbr);
+		abort_tail(tt_el);
 	}
 
 	tt_el->running = true;
@@ -236,7 +236,7 @@ void nct_swap_threads(void *this_arg, int next_allowed_thread_nbr)
 	if (tt_el->state == ABORTING) { /* We had set ourself as aborted => let's exit now */
 		NCT_DEBUG("Thread [%i] %i: %s: Aborting curr.\n",
 			  tt_el->thead_cnt, this_th_nbr, __func__);
-		abort_tail(tt_el, this_th_nbr);
+		abort_tail(tt_el);
 	} else {
 		nct_wait_until_allowed(tt_el, this_th_nbr);
 	}
@@ -269,7 +269,7 @@ void nct_first_thread_start(void *this_arg, int next_allowed_thread_nbr)
 static void *nct_thread_starter(void *arg_el)
 {
 	struct threads_table_el *tt_el = (struct threads_table_el *)arg_el;
-	struct nct_status_t *this = tt_el->nct_status;
+	const struct nct_status_t *this = tt_el->nct_status;
 
 	int thread_idx = tt_el->thread_idx;
 

common/src/nsi_hw_scheduler.c

@@ -163,4 +163,5 @@ void nsi_hws_init(void)
  */
 void nsi_hws_cleanup(void)
 {
+	/* Nothing to be done so far */
 }

native/src/irq_ctrl.c

@@ -90,14 +90,14 @@ int hw_irq_ctrl_get_highest_prio_irq(void)
 		return -1;
 	}
 
-	uint64_t irq_status = hw_irq_ctrl_get_irq_status();
+	uint64_t irq_status_temp = hw_irq_ctrl_get_irq_status();
 	int winner = -1;
 	int winner_prio = 256;
 
-	while (irq_status != 0U) {
-		int irq_nbr = nsi_find_lsb_set64(irq_status) - 1;
+	while (irq_status_temp != 0U) {
+		int irq_nbr = nsi_find_lsb_set64(irq_status_temp) - 1;
 
-		irq_status &= ~((uint64_t) 1 << irq_nbr);
+		irq_status_temp &= ~((uint64_t) 1 << irq_nbr);
 		if ((winner_prio > (int)irq_prio[irq_nbr])
 		   && (currently_running_prio > (int)irq_prio[irq_nbr])) {
 			winner = irq_nbr;
@@ -124,10 +124,8 @@ uint32_t hw_irq_ctrl_change_lock(uint32_t new_lock)
 
 	irqs_locked = new_lock;
 
-	if ((previous_lock == true) && (new_lock == false)) {
-		if (irq_status != 0U) {
-			nsif_cpu0_irq_raised_from_sw();
-		}
+	if ((previous_lock == true) && (new_lock == false) && (irq_status != 0U)) {
+		nsif_cpu0_irq_raised_from_sw();
 	}
 	return previous_lock;
 }
@@ -206,6 +204,8 @@ static inline void hw_irq_ctrl_irq_raise_prefix(unsigned int irq)
 		}
 	} else if (irq == PHONY_HARD_IRQ) {
 		lock_ignore = true;
+	} else {
+		/* PHONY_WEAK_IRQ does not require any action */
 	}
 }
 
@@ -218,7 +218,7 @@ static inline void hw_irq_ctrl_irq_raise_prefix(unsigned int irq)
 void hw_irq_ctrl_set_irq(unsigned int irq)
 {
 	hw_irq_ctrl_irq_raise_prefix(irq);
-	if ((irqs_locked == false) || (lock_ignore)) {
+	if ((irqs_locked == false) || lock_ignore) {
 		/*
 		 * Awake CPU in 1 delta
 		 * Note that we awake the CPU even if the IRQ is disabled
@@ -239,7 +239,7 @@ static void irq_raising_from_hw_now(void)
 	 * but not if irqs are locked unless this is due to a
 	 * PHONY_HARD_IRQ
 	 */
-	if ((irqs_locked == false) || (lock_ignore)) {
+	if ((irqs_locked == false) || lock_ignore) {
 		lock_ignore = false;
 		nsif_cpu0_irq_raised();
 	}

native/src/native_rtc.c

@@ -27,11 +27,11 @@ uint64_t native_rtc_gettime_us(int clock_type)
 
 		hwtimer_get_pseudohost_rtc_time(&nsec, &sec);
 		return sec * 1000000UL + nsec / 1000U;
+	} else {
+		nsi_print_error_and_exit("Unknown clock source %i\n",
+					clock_type);
+		return 0;
 	}
-
-	nsi_print_error_and_exit("Unknown clock source %i\n",
-				   clock_type);
-	return 0;
 }
 
 /**

native/src/nsi_cmdline.c

@@ -114,8 +114,6 @@ static void print_invalid_opt_error(char *argv)
  */
 void nsi_handle_cmd_line(int argc, char *argv[])
 {
-	int i;
-
 	nsi_add_testargs_option();
 
 	s_argv = argv;
@@ -130,9 +128,9 @@ void nsi_handle_cmd_line(int argc, char *argv[])
 		}
 	}
 
-	for (i = 1; i < argc; i++) {
+	for (int i = 1; i < argc; i++) {
 
-		if ((nsi_cmd_is_option(argv[i], "testargs", 0))) {
+		if (nsi_cmd_is_option(argv[i], "testargs", 0)) {
 			test_argc = argc - i - 1;
 			test_argv = &argv[i+1];
 			break;

native/src/nsi_cmdline_common.c

@@ -123,44 +123,44 @@ void nsi_cmd_read_option_value(const char *str, void *dest, const char type,
 			   const char *option)
 {
 	int error = 0;
-	char *endptr = NULL;
+	const char *endptr = NULL;
 
 	switch (type) {
 	case 'b':
 		if (strcasecmp(str, "false") == 0) {
 			*(bool *)dest = false;
-			endptr = (char *)str + 5;
+			endptr = (const char *)str + 5;
 		} else if (strcmp(str, "0") == 0) {
 			*(bool *)dest = false;
-			endptr = (char *)str + 1;
+			endptr = (const char *)str + 1;
 		} else if (strcasecmp(str, "true") == 0) {
 			*(bool *)dest = true;
-			endptr = (char *)str + 4;
+			endptr = (const char *)str + 4;
 		} else if (strcmp(str, "1") == 0) {
 			*(bool *)dest = true;
-			endptr = (char *)str + 1;
+			endptr = (const char *)str + 1;
 		} else {
 			error = 1;
 		}
 		break;
 	case 's':
-		*(char **)dest = (char *)str;
-		endptr = (char *)str + strlen(str);
+		*(const char **)dest = (const char *)str;
+		endptr = (const char *)str + strlen(str);
 		break;
 	case 'u':
-		*(uint32_t *)dest = strtoul(str, &endptr, 0);
+		*(uint32_t *)dest = strtoul(str, (char **)&endptr, 0);
 		break;
 	case 'U':
-		*(uint64_t *)dest = strtoull(str, &endptr, 0);
+		*(uint64_t *)dest = strtoull(str, (char **)&endptr, 0);
 		break;
 	case 'i':
-		*(int32_t *)dest = strtol(str, &endptr, 0);
+		*(int32_t *)dest = strtol(str, (char **)&endptr, 0);
 		break;
 	case 'I':
-		*(int64_t *)dest = strtoll(str, &endptr, 0);
+		*(int64_t *)dest = strtoll(str, (char **)&endptr, 0);
 		break;
 	case 'd':
-		*(double *)dest = strtod(str, &endptr);
+		*(double *)dest = strtod(str, (char **)&endptr);
 		break;
 	default:
 		nsi_print_error_and_exit(CMD_TYPE_ERROR, type);

native/src/timer_model.c

@@ -455,7 +455,7 @@ static void cmd_rt_ratio_found(char *argv, int offset)
 {
 	NSI_ARG_UNUSED(argv);
 	NSI_ARG_UNUSED(offset);
-	if ((args.rt_ratio <= 0)) {
+	if (args.rt_ratio <= 0) {
 		nsi_print_error_and_exit("The ratio needs to be > 0. "
 					  "Please use --help for more info\n");
 	}