RepoMirrors
/
kpatch
mirror of https://github.com/dynup/kpatch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kpatch-build: use err.h instead of error.h for musl support

This commit is contained in:
Nicolas Lorin 2022-08-05 08:52:03 +02:00
parent 67e4e2048a
commit 8cc0fedefb
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kpatch-build/create-diff-object.c
View File

@ -40,7 +40,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <error.h>
#include <err.h>
#include <gelf.h>
#include <argp.h>
#include <libgen.h>
@ -56,7 +56,7 @@
#define DIFF_FATAL(format, ...) \
({ \
fprintf(stderr, "ERROR: %s: " format "\n", childobj, ##__VA_ARGS__); \
error(EXIT_STATUS_DIFF_FATAL, 0, "unreconcilable difference"); \
err(EXIT_STATUS_DIFF_FATAL, "unreconcilable difference"); \
})
char *childobj;

2
kpatch-build/kpatch-elf.c
View File

@ -27,7 +27,7 @@
#include <string.h>
#include <fcntl.h>
#include <unistd.h>
#include <error.h>
#include <err.h>
#include <sys/types.h>
#include <sys/stat.h>

4
kpatch-build/log.h
View File

@ -1,7 +1,7 @@
#ifndef _LOG_H_
#define _LOG_H_
#include <error.h>
#include <err.h>
#include "kpatch.h"
/* Files that include log.h must define loglevel and childobj */
@ -9,7 +9,7 @@ extern enum loglevel loglevel;
extern char *childobj;
#define ERROR(format, ...) \
error(EXIT_STATUS_ERROR, 0, "ERROR: %s: %s: %d: " format, childobj, __FUNCTION__, __LINE__, ##__VA_ARGS__)
err(EXIT_STATUS_ERROR, "ERROR: %s: %s: %d: " format, childobj, __FUNCTION__, __LINE__, ##__VA_ARGS__)
#define log_debug(format, ...) log(DEBUG, format, ##__VA_ARGS__)
#define log_normal(format, ...) log(NORMAL, "%s: " format, childobj, ##__VA_ARGS__)

2
kpatch-build/lookup.c
View File

@ -31,7 +31,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <error.h>
#include <err.h>
#include <gelf.h>
#include <unistd.h>
#include <libgen.h>