diff options
| author | Thomas White <taw@physics.org> | 2019-01-29 17:15:06 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2019-01-29 17:21:06 +0100 |
| commit | 1fdbafbb687c32dc167a572a3048e32099720fde (patch) | |
| tree | 7c2f71637cad9d11fce81cff35e94b24c0b2654c /libcrystfel/src/events.c | |
| parent | 83b4dbe4a0146da76fbb69fde213176d44e1a2ae (diff) | |
Fix some compiler warnings about string handling
Diffstat (limited to 'libcrystfel/src/events.c')
| -rw-r--r-- | libcrystfel/src/events.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libcrystfel/src/events.c b/libcrystfel/src/events.c index c73a816c..bb4047c9 100644 --- a/libcrystfel/src/events.c +++ b/libcrystfel/src/events.c @@ -314,9 +314,9 @@ char *get_event_string(struct event *ev) } ret_string=new_ret_string; - strncpy(&ret_string[ret_string_len],"/", 1); - strncpy(&ret_string[ret_string_len+1],ev->path_entries[pi], - strlen(ev->path_entries[pi])); + ret_string[ret_string_len] = '/'; + strcpy(&ret_string[ret_string_len+1], + ev->path_entries[pi]); ret_string_len += 1+strlen(ev->path_entries[pi]); @@ -330,7 +330,7 @@ char *get_event_string(struct event *ev) ret_string = new_ret_string; - strncpy(&ret_string[ret_string_len], "/", 1); + ret_string[ret_string_len] = '/'; ret_string_len += 1; } else { @@ -357,9 +357,8 @@ char *get_event_string(struct event *ev) ret_string = new_ret_string; - strncpy(&ret_string[ret_string_len],"/", 1); - strncpy(&ret_string[ret_string_len+1], num_buf, - strlen(num_buf)); + ret_string[ret_string_len] = '/'; + strcpy(&ret_string[ret_string_len+1], num_buf); ret_string_len += 1+strlen(num_buf); } @@ -374,7 +373,7 @@ char *get_event_string(struct event *ev) ret_string = new_ret_string; - strncpy(&ret_string[ret_string_len], "/", 1); + ret_string[ret_string_len] = '/'; ret_string_len += 1; } |