packages/openpgm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
openpgm/First-batch-of-modernization.patch
yaokai13 ae26133586 Change source
2020-11-13 10:10:51 +08:00

237 lines
8.1 KiB
Diff
Raw Blame History

From f6acc38db7c0cb598ca8a52e7d245676841a3a41 Mon Sep 17 00:00:00 2001
From: Denis Arnaud <denis.arnaud_fedora@m4x.org>
Date: Sun, 27 Oct 2019 21:08:03 +0100
Subject: [PATCH] First batch of modernization
---
openpgm/pgm/SConscript.autoconf | 2 +-
openpgm/pgm/SConstruct | 6 +++---
openpgm/pgm/include/impl/messages.h | 20 ++++++++++----------
openpgm/pgm/mem.c | 8 ++++----
openpgm/pgm/version_generator.py | 2 +-
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/openpgm/pgm/SConscript.autoconf b/openpgm/pgm/SConscript.autoconf
index d3d833d1..883c1b30 100644
--- a/openpgm/pgm/SConscript.autoconf
+++ b/openpgm/pgm/SConscript.autoconf
@@ -113,7 +113,7 @@ def CheckMember (context, member, header):
int
main ()
{
- offsetof (""" + string.replace (member, '.', ', ') + """);
+ offsetof (""" + member.replace('.', ', ') + """);
return 0;
}
"""
diff --git a/openpgm/pgm/SConstruct b/openpgm/pgm/SConstruct
index adff0b7b..a1263e67 100644
--- a/openpgm/pgm/SConstruct
+++ b/openpgm/pgm/SConstruct
@@ -202,15 +202,15 @@ if env['WITH_SNMP'] == 'true':
conf = Configure(env, custom_tests = tests);
if env['WITH_SNMP'] == 'true' and not conf.CheckSNMP():
- print 'Net-SNMP libraries not compatible.';
+ print ('Net-SNMP libraries not compatible.');
Exit(1);
if env['WITH_CHECK'] == 'true' and conf.CheckCheck():
- print 'Enabling Check unit tests.';
+ print ('Enabling Check unit tests.');
conf.env['CHECK'] = 'true';
env['CHECK_FLAGS'] = env.ParseFlags('!pkg-config --cflags --libs check');
else:
- print 'Disabling Check unit tests.';
+ print ('Disabling Check unit tests.');
conf.env['CHECK'] = 'false';
env = conf.Finish();
diff --git a/openpgm/pgm/include/impl/messages.h b/openpgm/pgm/include/impl/messages.h
index 812393fd..1655e9c9 100644
--- a/openpgm/pgm/include/impl/messages.h
+++ b/openpgm/pgm/include/impl/messages.h
@@ -185,14 +185,14 @@ static inline void pgm_fatal (const char* format, ...) {
#define pgm_warn_if_reached() \
do { \
pgm_warn ("file %s: line %d (%s): code should not be reached", \
- __FILE__, __LINE__, __PRETTY_FUNCTION__); \
+ __FILE__, __LINE__, __func__); \
} while (0)
#define pgm_warn_if_fail(expr) \
do { \
if (PGM_LIKELY (expr)); \
else \
pgm_warn ("file %s: line %d (%s): runtime check failed: (%s)", \
- __FILE__, __LINE__, __PRETTY_FUNCTION__, #expr); \
+ __FILE__, __LINE__, __func__, #expr); \
} while (0)
@@ -210,14 +210,14 @@ static inline void pgm_fatal (const char* format, ...) {
if (PGM_LIKELY(expr)); \
else { \
pgm_fatal ("file %s: line %d (%s): assertion failed: (%s)", \
- __FILE__, __LINE__, __PRETTY_FUNCTION__, #expr); \
+ __FILE__, __LINE__, __func__, #expr); \
abort (); \
} \
} while (0)
# define pgm_assert_not_reached() \
do { \
pgm_fatal ("file %s: line %d (%s): should not be reached", \
- __FILE__, __LINE__, __PRETTY_FUNCTION__); \
+ __FILE__, __LINE__, __func__); \
abort (); \
} while (0)
# define pgm_assert_cmpint(n1, cmp, n2) \
@@ -226,7 +226,7 @@ static inline void pgm_fatal (const char* format, ...) {
if (PGM_LIKELY(_n1 cmp _n2)); \
else { \
pgm_fatal ("file %s: line %d (%s): assertion failed (%s): (%" PRIi64 " %s %" PRIi64 ")", \
- __FILE__, __LINE__, __PRETTY_FUNCTION__, #n1 " " #cmp " " #n2, _n1, #cmp, _n2); \
+ __FILE__, __LINE__, __func__, #n1 " " #cmp " " #n2, _n1, #cmp, _n2); \
abort (); \
} \
} while (0)
@@ -236,7 +236,7 @@ static inline void pgm_fatal (const char* format, ...) {
if (PGM_LIKELY(_n1 cmp _n2)); \
else { \
pgm_fatal ("file %s: line %d (%s): assertion failed (%s): (%" PRIu64 " %s %" PRIu64 ")", \
- __FILE__, __LINE__, __PRETTY_FUNCTION__, #n1 " " #cmp " " #n2, _n1, #cmp, _n2); \
+ __FILE__, __LINE__, __func__, #n1 " " #cmp " " #n2, _n1, #cmp, _n2); \
abort (); \
} \
} while (0)
@@ -295,7 +295,7 @@ static inline void pgm_fatal (const char* format, ...) {
if (PGM_LIKELY(expr)); \
else { \
pgm_warn ("file %s: line %d (%s): assertion `%s' failed", \
- __FILE__, __LINE__, __PRETTY_FUNCTION__, #expr); \
+ __FILE__, __LINE__, __func__, #expr); \
return; \
} \
} while (0)
@@ -304,20 +304,20 @@ static inline void pgm_fatal (const char* format, ...) {
if (PGM_LIKELY(expr)); \
else { \
pgm_warn ("file %s: line %d (%s): assertion `%s' failed", \
- __FILE__, __LINE__, __PRETTY_FUNCTION__, #expr); \
+ __FILE__, __LINE__, __func__, #expr); \
return (val); \
} \
} while (0)
# define pgm_return_if_reached() \
do { \
pgm_warn ("file %s: line %d (%s): should not be reached", \
- __FILE__, __LINE__, __PRETTY_FUNCTION__); \
+ __FILE__, __LINE__, __func__); \
return; \
} while (0)
# define pgm_return_val_if_reached(val) \
do { \
pgm_warn ("file %s: line %d (%s): should not be reached", \
- __FILE__, __LINE__, __PRETTY_FUNCTION__); \
+ __FILE__, __LINE__, __func__); \
return (val); \
} while (0)
diff --git a/openpgm/pgm/mem.c b/openpgm/pgm/mem.c
index 5697baf9..d3d52951 100644
--- a/openpgm/pgm/mem.c
+++ b/openpgm/pgm/mem.c
@@ -163,7 +163,7 @@ pgm_malloc (
#ifdef __GNUC__
pgm_fatal ("file %s: line %d (%s): failed to allocate %" PRIzu " bytes",
- __FILE__, __LINE__, __PRETTY_FUNCTION__,
+ __FILE__, __LINE__, __func__,
n_bytes);
#else
pgm_fatal ("file %s: line %d: failed to allocate %" PRIzu " bytes",
@@ -186,7 +186,7 @@ pgm_malloc_n (
if (SIZE_OVERFLOWS (n_blocks, block_bytes)) {
#ifdef __GNUC__
pgm_fatal ("file %s: line %d (%s): overflow allocating %" PRIzu "*%" PRIzu " bytes",
- __FILE__, __LINE__, __PRETTY_FUNCTION__,
+ __FILE__, __LINE__, __func__,
n_blocks, block_bytes);
#else
pgm_fatal ("file %s: line %d: overflow allocating %" PRIzu "*%" PRIzu " bytes",
@@ -210,7 +210,7 @@ pgm_malloc0 (
#ifdef __GNUC__
pgm_fatal ("file %s: line %d (%s): failed to allocate %" PRIzu " bytes",
- __FILE__, __LINE__, __PRETTY_FUNCTION__,
+ __FILE__, __LINE__, __func__,
n_bytes);
#else
pgm_fatal ("file %s: line %d: failed to allocate %" PRIzu " bytes",
@@ -236,7 +236,7 @@ pgm_malloc0_n (
#ifdef __GNUC__
pgm_fatal ("file %s: line %d (%s): failed to allocate %" PRIzu "*%" PRIzu " bytes",
- __FILE__, __LINE__, __PRETTY_FUNCTION__,
+ __FILE__, __LINE__, __func__,
n_blocks, block_bytes);
#else
pgm_fatal ("file %s: line %d: failed to allocate %" PRIzu "*%" PRIzu " bytes",
diff --git a/openpgm/pgm/version_generator.py b/openpgm/pgm/version_generator.py
index e489aef..581eabe 100755
--- a/openpgm/pgm/version_generator.py
+++ b/openpgm/pgm/version_generator.py
@@ -1,19 +1,25 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import os
import platform
import time
-build_date = time.strftime ("%Y-%m-%d")
-build_time = time.strftime ("%H:%M:%S")
-build_rev = filter (str.isdigit, "$Revision$")
+timestamp = time.gmtime(int(os.environ.get('SOURCE_DATE_EPOCH', time.time())))
+build_date = time.strftime ("%Y-%m-%d", timestamp)
+build_time = time.strftime ("%H:%M:%S", timestamp)
+build_rev = ''.join (list (filter (str.isdigit, "$Revision$")))
+build_system = platform.system()
+build_machine = platform.machine()
+if 'SOURCE_DATE_EPOCH' in os.environ:
+ build_system = 'BuildSystem'
+ build_machine = 'BuildMachine'
-print """
+print ("""
/* vim:ts=8:sts=8:sw=4:noai:noexpandtab
*
* OpenPGM version.
*
- * Copyright (c) 2006-2011 Miru Limited.
+ * Copyright (c) 2006-2014 Miru Limited.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -41,15 +47,15 @@
const unsigned pgm_major_version = 5;
const unsigned pgm_minor_version = 2;
const unsigned pgm_micro_version = 122;
-const char* pgm_build_date = "%s";
-const char* pgm_build_time = "%s";
-const char* pgm_build_system = "%s";
-const char* pgm_build_machine = "%s";
-const char* pgm_build_revision = "%s";
+const char* pgm_build_date = "{0}";
+const char* pgm_build_time = "{1}";
+const char* pgm_build_system = "{2}";
+const char* pgm_build_machine = "{3}";
+const char* pgm_build_revision = "{4}";
/* eof */
-"""%(build_date, build_time, platform.system(), platform.machine(), build_rev)
+""".format (build_date, build_time, build_system, build_machine, build_rev))
# end of file
Reference in New Issue View Git Blame Copy Permalink