proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-30 06:39:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3967 from brauner/2021-09-03.fixes

Browse Source 
log: fix cross-compilation with %m modifier
This commit is contained in:
Stéphane Graber 2021-09-13 08:37:25 -04:00 committed by GitHub
commit 332a0a8f47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
configure.ac
View File

@ -710,32 +710,6 @@ AC_CHECK_MEMBERS([struct clone_args.cgroup],[],[],[[#include <linux/sched.h>]])
# - STRERROR_R_CHAR_P if it returns char * # - STRERROR_R_CHAR_P if it returns char *
AC_FUNC_STRERROR_R AC_FUNC_STRERROR_R
# Check if "%m" is supported by printf and Co
AC_MSG_CHECKING([%m format])
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
int main(void)
{
char msg[256];
int rc;
rc = snprintf(msg, sizeof(msg), "%m\n");
if ((rc > 1) && (msg[0] != '%'))
{
return 0;
}
else
{
return 1;
}
}]])],[fmt_m=yes],[fmt_m=no],[fmt_m=no])
if test "x$fmt_m" = "xyes"; then
AC_DEFINE([HAVE_M_FORMAT], 1, [Have %m format])
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
# Check for some functions # Check for some functions
AC_CHECK_LIB(pthread, main) AC_CHECK_LIB(pthread, main)
AC_CHECK_LIB(util, openpty) AC_CHECK_LIB(util, openpty)

16
src/lxc/log.h
View File

@ -393,7 +393,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \
LXC_FATAL(&locinfo, format, ##__VA_ARGS__); \ LXC_FATAL(&locinfo, format, ##__VA_ARGS__); \
} while (0) } while (0)
#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD #if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD
#define SYSTRACE(format, ...) \ #define SYSTRACE(format, ...) \
TRACE("%m - " format, ##__VA_ARGS__) TRACE("%m - " format, ##__VA_ARGS__)
#else #else
@ -404,7 +404,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \
} while (0) } while (0)
#endif #endif
#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD #if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD
#define SYSDEBUG(format, ...) \ #define SYSDEBUG(format, ...) \
DEBUG("%m - " format, ##__VA_ARGS__) DEBUG("%m - " format, ##__VA_ARGS__)
#else #else
@ -416,7 +416,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \
#endif #endif
#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD #if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD
#define SYSINFO(format, ...) \ #define SYSINFO(format, ...) \
INFO("%m - " format, ##__VA_ARGS__) INFO("%m - " format, ##__VA_ARGS__)
#else #else
@ -427,7 +427,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \
} while (0) } while (0)
#endif #endif
#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD #if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD
#define SYSNOTICE(format, ...) \ #define SYSNOTICE(format, ...) \
NOTICE("%m - " format, ##__VA_ARGS__) NOTICE("%m - " format, ##__VA_ARGS__)
#else #else
@ -438,7 +438,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \
} while (0) } while (0)
#endif #endif
#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD #if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD
#define SYSWARN(format, ...) \ #define SYSWARN(format, ...) \
WARN("%m - " format, ##__VA_ARGS__) WARN("%m - " format, ##__VA_ARGS__)
#else #else
@ -449,7 +449,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \
} while (0) } while (0)
#endif #endif
#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD #if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD
#define SYSERROR(format, ...) \ #define SYSERROR(format, ...) \
ERROR("%m - " format, ##__VA_ARGS__) ERROR("%m - " format, ##__VA_ARGS__)
#else #else
@ -460,7 +460,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \
} while (0) } while (0)
#endif #endif
#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD #if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD
#define CMD_SYSERROR(format, ...) \ #define CMD_SYSERROR(format, ...) \
fprintf(stderr, "%s: %d: %s - %m - " format "\n", __FILE__, __LINE__, \ fprintf(stderr, "%s: %d: %s - %m - " format "\n", __FILE__, __LINE__, \
__func__, ##__VA_ARGS__); __func__, ##__VA_ARGS__);
@ -473,7 +473,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \
} while (0) } while (0)
#endif #endif
#if HAVE_M_FORMAT && !ENABLE_COVERITY_BUILD #if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD
#define CMD_SYSINFO(format, ...) \ #define CMD_SYSINFO(format, ...) \
printf("%s: %d: %s - %m - " format "\n", __FILE__, __LINE__, __func__, \ printf("%s: %d: %s - %m - " format "\n", __FILE__, __LINE__, __func__, \
##__VA_ARGS__); ##__VA_ARGS__);