From 7e2ce386ca9ed825aaac2babe09946380af6bb94 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Mon, 18 Aug 2014 12:57:03 +0200 Subject: [PATCH] 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. --- src/shared/memfd.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/shared/memfd.h b/src/shared/memfd.h index 6de045c1d..452fb508f 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 #include #include - -#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 -- 2.30.2