diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2014-08-18 12:57:03 +0200 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2014-08-18 12:57:03 +0200 |
| commit | 7e2ce386ca9ed825aaac2babe09946380af6bb94 (patch) | |
| tree | f514168c269ebb2ec512bf1664f0129d0a12ba85 | |
| parent | 4632777024b7ba210e4efe5cfabc8cd0b5991045 (diff) | |
memfd: internalize header
Fix the memfd.h header to use handy features like #pragma, cleanup-funcs
and util.h. Also drop the EXTERN-C macros.
| -rw-r--r-- | src/shared/memfd.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/shared/memfd.h b/src/shared/memfd.h index 6de045c1d7..452fb508f8 100644 --- a/src/shared/memfd.h +++ b/src/shared/memfd.h @@ -1,7 +1,6 @@ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -#ifndef foosdmemfdhfoo -#define foosdmemfdhfoo +#pragma once /*** This file is part of systemd. @@ -25,10 +24,8 @@ #include <inttypes.h> #include <sys/types.h> #include <stdio.h> - -#include "_sd-common.h" - -_SD_BEGIN_DECLARATIONS; +#include "macro.h" +#include "util.h" typedef struct sd_memfd sd_memfd; @@ -38,6 +35,8 @@ int sd_memfd_new_and_map(sd_memfd **m, const char *name, size_t sz, void **p); void sd_memfd_free(sd_memfd *m); +DEFINE_TRIVIAL_CLEANUP_FUNC(sd_memfd*, sd_memfd_free); + int sd_memfd_get_fd(sd_memfd *m); int sd_memfd_dup_fd(sd_memfd *n); int sd_memfd_get_file(sd_memfd *m, FILE **f); @@ -51,7 +50,3 @@ int sd_memfd_get_size(sd_memfd *m, uint64_t *sz); int sd_memfd_set_size(sd_memfd *m, uint64_t sz); int sd_memfd_get_name(sd_memfd *m, char **name); - -_SD_END_DECLARATIONS; - -#endif |