diff --git a/lib/cmp_io.c b/lib/cmp_io.c
index f8a4883fb2d5a765ec896a16595d95d453ff01fe..a730ea922fd88eb0e93c0b7bb1655715e2125bb1 100644
--- a/lib/cmp_io.c
+++ b/lib/cmp_io.c
@@ -286,15 +286,13 @@ int write_data_to_file(const void *buf, uint32_t buf_size, const char *output_pr
 
 static void remove_spaces(char *s)
 {
-	const char *d;
+	const char *d = s;
 
 	if (!s)
 		return;
 
-	d = s;
-
 	do {
-		while (*d == ' ' || *d == '\t')
+		while (isspace(*d))
 			d++;
 	} while ((*s++ = *d++) != '\0');
 }