picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9959 from yuwata/small-fixes 

tiny fixes and a cleanup
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-08-29 17:47:00 +02:00 committed by GitHub
parent efa1463693 a2b635eb39
commit 31e775ec38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/basic/string-table.h
View File

@ -58,7 +58,7 @@ ssize_t string_table_lookup(const char * const *table, size_t len, const char *k
}
#define _DEFINE_STRING_TABLE_LOOKUP_FROM_STRING_FALLBACK(name,type,max,scope) \
type name##_from_string(const char *s) { \
scope type name##_from_string(const char *s) { \
type i; \
unsigned u = 0; \
if (!s) \

3
src/boot/efi/util.h
View File

@ -32,7 +32,6 @@ CHAR16 *stra_to_path(CHAR8 *stra);
CHAR16 *stra_to_str(CHAR8 *stra);
EFI_STATUS file_read(EFI_FILE_HANDLE dir, CHAR16 *name, UINTN off, UINTN size, CHAR8 **content, UINTN *content_size);
#endif
static inline void FreePoolp(void *p) {
FreePool(*(void**) p);
@ -40,3 +39,5 @@ static inline void FreePoolp(void *p) {
#define _cleanup_(x) __attribute__((cleanup(x)))
#define _cleanup_freepool_ _cleanup_(FreePoolp)
#endif

2
src/core/dynamic-user.c
View File

@ -34,7 +34,7 @@ static DynamicUser* dynamic_user_free(DynamicUser *d) {
}
static int dynamic_user_add(Manager *m, const char *name, int storage_socket[2], DynamicUser **ret) {
DynamicUser *d = NULL;
DynamicUser *d;
int r;
assert(m);