Merge pull request #1889 from HideoYamauchi/trac5267-5

oalbrigt · web-flow · commit 3a427e902961 · 2023-09-26T08:54:23.000+02:00
Low: storage-mon: Remove unnecessary code and fix typos.
diff --git a/tools/storage_mon.c b/tools/storage_mon.c
@@ -318,12 +318,7 @@ static int32_t sigchld_handler(int32_t sig, void *data)
 								daemon_check_first_all_devices = TRUE;
 							}
 						}
-#if 0
-						if (shutting_down == FALSE) {
-							finished_count++;
-							test_forks[index] = 0;
-						}
-#endif
+
 						finished_count++;
 						test_forks[index] = 0;
 					
@@ -521,7 +516,7 @@ static int test_device_main(gpointer data)
 				}
 			}
 		} else {
-			/* Rrun the child process timeout watch timer. */
+			/* Run the child process timeout watch timer. */
 			qb_loop_timer_add(storage_mon_poll_handle, QB_LOOP_MED, timeout * QB_TIME_NS_IN_SEC, NULL, child_timeout_handler, &expire_handle); 
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -318,12 +318,7 @@ static int32_t sigchld_handler(int32_t sig, void *data)`
`318`	`318`	`daemon_check_first_all_devices = TRUE;`
`319`	`319`	`}`
`320`	`320`	`}`
`321`		`-#if 0`
`322`		`- if (shutting_down == FALSE) {`
`323`		`- finished_count++;`
`324`		`- test_forks[index] = 0;`
`325`		`- }`
`326`		`-#endif`
	`321`	`+`
`327`	`322`	`finished_count++;`
`328`	`323`	`test_forks[index] = 0;`
`329`	`324`
`@@ -521,7 +516,7 @@ static int test_device_main(gpointer data)`
`521`	`516`	`}`
`522`	`517`	`}`
`523`	`518`	`} else {`
`524`		`- /* Rrun the child process timeout watch timer. */`
	`519`	`+ /* Run the child process timeout watch timer. */`
`525`	`520`	`qb_loop_timer_add(storage_mon_poll_handle, QB_LOOP_MED, timeout * QB_TIME_NS_IN_SEC, NULL, child_timeout_handler, &expire_handle);`
`526`	`521`	`}`
`527`	`522`	`}`