shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-26 14:04:03 +03:00
Code

util, manager: and mempset() and use it

Browse Source 
Just like mempcpy() is almost identical to memcpy() except the useful
return value, so is the relation of mempset() to memset().
This commit is contained in:
Michal Schmidt 2013-03-05 15:52:44 +01:00
parent 5052495bba
commit 6282c859bd
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/manager.c
View File

@ -226,10 +226,8 @@ static void draw_cylon(char buffer[], size_t buflen, unsigned width, unsigned po
assert(pos <= width+1); /* 0 or width+1 mean that the center light is behind the corner */
if (pos > 1) {
if (pos > 2) {
memset(p, ' ', pos-2);
p += pos-2;
}
if (pos > 2)
p = mempset(p, ' ', pos-2);
p = stpcpy(p, ANSI_RED_ON);
*p++ = '*';
}
@ -244,10 +242,8 @@ static void draw_cylon(char buffer[], size_t buflen, unsigned width, unsigned po
if (pos < width) {
p = stpcpy(p, ANSI_RED_ON);
*p++ = '*';
if (pos < width-1) {
memset(p, ' ', width-1-pos);
p += width-1-pos;
}
if (pos < width-1)
p = mempset(p, ' ', width-1-pos);
p = stpcpy(p, ANSI_HIGHLIGHT_OFF);
}
}

5
src/shared/util.h
View File

@ -594,3 +594,8 @@ int search_and_fopen_nulstr(const char *path, const char *mode, const char *sear
} else if (ignore_file((de)->d_name)) \
continue; \
else
static inline void *mempset(void *s, int c, size_t n) {
memset(s, c, n);
return (char*)s + n;
}