C string usage improvment

Change-Id: I5c59f0d2d1b911ffa1ee251e0f1355d137616493
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>