X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fspecifier.h;h=fca206f665fa7dd5986d4a88ed82823d3964452d;hp=57d1fcb35cf1821f5dd6c529354a8bcccecdb289;hb=4e2f8d27781731021aa6b96c0ee18a8966eefe1c;hpb=f33d3ec1d7521c91da8b30ad5cb345d6416bb07d diff --git a/src/shared/specifier.h b/src/shared/specifier.h index 57d1fcb35..fca206f66 100644 --- a/src/shared/specifier.h +++ b/src/shared/specifier.h @@ -1,7 +1,6 @@ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -#ifndef foospecifierhfoo -#define foospecifierhfoo +#pragma once /*** This file is part of systemd. @@ -22,7 +21,7 @@ along with systemd; If not, see . ***/ -typedef char* (*SpecifierCallback)(char specifier, void *data, void *userdata); +typedef int (*SpecifierCallback)(char specifier, void *data, void *userdata, char **ret); typedef struct Specifier { const char specifier; @@ -30,8 +29,11 @@ typedef struct Specifier { void *data; } Specifier; -char *specifier_printf(const char *text, const Specifier table[], void *userdata); +int specifier_printf(const char *text, const Specifier table[], void *userdata, char **ret); -char* specifier_string(char specifier, void *data, void *userdata); +int specifier_string(char specifier, void *data, void *userdata, char **ret); -#endif +int specifier_machine_id(char specifier, void *data, void *userdata, char **ret); +int specifier_boot_id(char specifier, void *data, void *userdata, char **ret); +int specifier_host_name(char specifier, void *data, void *userdata, char **ret); +int specifier_kernel_release(char specifier, void *data, void *userdata, char **ret);