sd-daemon: remove unnecessary memset calls

There is no point in clearing the bits of a "struct stat" when the very
next statement just calls stat or fstat to fill in that same memory.

[zj: two more places]

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 7fcd63a17a69b3d05124cf712a526f48225d1689..bbd82b9d2472d4cda178d530fbb49506da80cad4 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -2287,7 +2287,6 @@ static int load_from_path(Unit *u, const char *path) {
                 goto finish;
         }
 
                 goto finish;
         }
 

-        zero(st);

         if (fstat(fileno(f), &st) < 0) {
                 r = -errno;
                 goto finish;
         if (fstat(fileno(f), &st) < 0) {
                 r = -errno;
                 goto finish;

diff --git a/src/core/service.c b/src/core/service.c
index 30598de9b85ce380769df1953b939184dbc8c34b..1c127bdbcb2ffc5c6926d210a63d278ea90078a8 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -564,7 +564,6 @@ static int service_load_sysv_path(Service *s, const char *path) {
                 goto finish;
         }
 
                 goto finish;
         }
 

-        zero(st);

         if (fstat(fileno(f), &st) < 0) {
                 r = -errno;
                 goto finish;
         if (fstat(fileno(f), &st) < 0) {
                 r = -errno;
                 goto finish;

diff --git a/src/libsystemd-daemon/sd-daemon.c b/src/libsystemd-daemon/sd-daemon.c
index 763e079b4ec0ac7cfa9bda49341e29a0672f2e87..863ac7529060d7560e765aeb612dcebc422fb259 100644 (file)
--- a/src/libsystemd-daemon/sd-daemon.c
+++ b/src/libsystemd-daemon/sd-daemon.c
@@ -152,7 +152,6 @@ _sd_export_ int sd_is_fifo(int fd, const char *path) {
         if (fd < 0)
                 return -EINVAL;
 
         if (fd < 0)
                 return -EINVAL;
 

-        memset(&st_fd, 0, sizeof(st_fd));

         if (fstat(fd, &st_fd) < 0)
                 return -errno;
 
         if (fstat(fd, &st_fd) < 0)
                 return -errno;
 


@@ -162,7 +161,6 @@ _sd_export_ int sd_is_fifo(int fd, const char *path) {
         if (path) {
                 struct stat st_path;
 
         if (path) {
                 struct stat st_path;
 

-                memset(&st_path, 0, sizeof(st_path));

                 if (stat(path, &st_path) < 0) {
 
                         if (errno == ENOENT || errno == ENOTDIR)
                 if (stat(path, &st_path) < 0) {
 
                         if (errno == ENOENT || errno == ENOTDIR)