CLEANUP: patterns: get rid of pattern_data_setstring()
This function was only used to call chunk_init_len() from another chunk,
which in the end consists in simply assigning the source chunk to the
destination chunk. Let's remove this indirection to make the code clearer.
Anyway it was the only place such a function was used.
diff --git a/src/pattern.c b/src/pattern.c
index bebeabe..78728f6 100644
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -115,14 +115,6 @@
return &trash_chunk;
}
-/*
-* Used to set pattern data from a struct chunk, could be the trash struct chunk
-*/
-static void pattern_data_setstring(union pattern_data *data, struct chunk *c)
-{
- chunk_initlen(&data->str, c->str, c->size, c->len);
-}
-
/******************************************************************/
/* Pattern casts functions */
/******************************************************************/
@@ -141,7 +133,7 @@
return 0;
trash->len = strlen(trash->str);
- pattern_data_setstring(data, trash);
+ data->str = *trash;
return 1;
}
@@ -160,8 +152,7 @@
return 0;
trash->len = strlen(trash->str);
- pattern_data_setstring(data, trash);
-
+ data->str = *trash;
return 1;
}
@@ -203,9 +194,7 @@
trash->size = trash->size - (pos - trash->str);
trash->str = pos;
trash->len = strlen(pos);
-
- pattern_data_setstring(data, trash);
-
+ data->str = *trash;
return 1;
}
@@ -215,9 +204,7 @@
trash->len = data->str.len < trash->size ? data->str.len : trash->size;
memcpy(trash->str, data->str.str, trash->len);
-
- pattern_data_setstring(data, trash);
-
+ data->str = *trash;
return 1;
}