开源软件构建与测试

_service:tar_scm:libtalloc.spec Changed

_service Changed

_service:tar_scm:talloc-2.4.1.tar.gz/ABI/pytalloc-util-2.4.1.sigs Added

_service:tar_scm:talloc-2.4.1.tar.gz/ABI/talloc-2.4.1.sigs Added

@@ -0,0 +1,66 @@
+_talloc: void *(const void *, size_t)
+_talloc_array: void *(const void *, size_t, unsigned int, const char *)
+_talloc_free: int (void *, const char *)
+_talloc_get_type_abort: void *(const void *, const char *, const char *)
+_talloc_memdup: void *(const void *, const void *, size_t, const char *)
+_talloc_move: void *(const void *, const void *)
+_talloc_pooled_object: void *(const void *, size_t, const char *, unsigned int, size_t)
+_talloc_realloc: void *(const void *, void *, size_t, const char *)
+_talloc_realloc_array: void *(const void *, void *, size_t, unsigned int, const char *)
+_talloc_reference_loc: void *(const void *, const void *, const char *)
+_talloc_set_destructor: void (const void *, int (*)(void *))
+_talloc_steal_loc: void *(const void *, const void *, const char *)
+_talloc_zero: void *(const void *, size_t, const char *)
+_talloc_zero_array: void *(const void *, size_t, unsigned int, const char *)
+talloc_asprintf: char *(const void *, const char *, ...)
+talloc_asprintf_addbuf: void (char **, const char *, ...)
+talloc_asprintf_append: char *(char *, const char *, ...)
+talloc_asprintf_append_buffer: char *(char *, const char *, ...)
+talloc_autofree_context: void *(void)
+talloc_check_name: void *(const void *, const char *)
+talloc_disable_null_tracking: void (void)
+talloc_enable_leak_report: void (void)
+talloc_enable_leak_report_full: void (void)
+talloc_enable_null_tracking: void (void)
+talloc_enable_null_tracking_no_autofree: void (void)
+talloc_find_parent_byname: void *(const void *, const char *)
+talloc_free_children: void (void *)
+talloc_get_name: const char *(const void *)
+talloc_get_size: size_t (const void *)
+talloc_increase_ref_count: int (const void *)
+talloc_init: void *(const char *, ...)
+talloc_is_parent: int (const void *, const void *)
+talloc_named: void *(const void *, size_t, const char *, ...)
+talloc_named_const: void *(const void *, size_t, const char *)
+talloc_parent: void *(const void *)
+talloc_parent_name: const char *(const void *)
+talloc_pool: void *(const void *, size_t)
+talloc_realloc_fn: void *(const void *, void *, size_t)
+talloc_reference_count: size_t (const void *)
+talloc_reparent: void *(const void *, const void *, const void *)
+talloc_report: void (const void *, FILE *)
+talloc_report_depth_cb: void (const void *, int, int, void (*)(const void *, int, int, int, void *), void *)
+talloc_report_depth_file: void (const void *, int, int, FILE *)
+talloc_report_full: void (const void *, FILE *)
+talloc_set_abort_fn: void (void (*)(const char *))
+talloc_set_log_fn: void (void (*)(const char *))
+talloc_set_log_stderr: void (void)
+talloc_set_memlimit: int (const void *, size_t)
+talloc_set_name: const char *(const void *, const char *, ...)
+talloc_set_name_const: void (const void *, const char *)
+talloc_show_parents: void (const void *, FILE *)
+talloc_strdup: char *(const void *, const char *)
+talloc_strdup_append: char *(char *, const char *)
+talloc_strdup_append_buffer: char *(char *, const char *)
+talloc_strndup: char *(const void *, const char *, size_t)
+talloc_strndup_append: char *(char *, const char *, size_t)
+talloc_strndup_append_buffer: char *(char *, const char *, size_t)
+talloc_test_get_magic: int (void)
+talloc_total_blocks: size_t (const void *)
+talloc_total_size: size_t (const void *)
+talloc_unlink: int (const void *, void *)
+talloc_vasprintf: char *(const void *, const char *, va_list)
+talloc_vasprintf_append: char *(char *, const char *, va_list)
+talloc_vasprintf_append_buffer: char *(char *, const char *, va_list)
+talloc_version_major: int (void)
+talloc_version_minor: int (void)

_service:tar_scm:talloc-2.4.0.tar.gz/Makefile -> _service:tar_scm:talloc-2.4.1.tar.gz/Makefile Changed

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/examples/run_on_target.py -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/examples/run_on_target.py Changed

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/wafsamba/configure_file.py -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/wafsamba/configure_file.py Changed

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/wafsamba/pkgconfig.py -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/wafsamba/pkgconfig.py Changed

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/wafsamba/samba_abi.py -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/wafsamba/samba_abi.py Changed

@@ -21,16 +21,16 @@
 def normalise_signature(sig):
     '''normalise a signature from gdb'''
     sig = sig.strip()
-    sig = re.sub('^\$0-9+\s=\s\{(.+)\}$', r'\1', sig)
-    sig = re.sub('^\$0-9+\s=\s\{(.+)\}(\s0x0-9a-f+\s<\w+>)+$', r'\1', sig)
-    sig = re.sub('^\$0-9+\s=\s(0x0-9a-f+)\s?(<\w+>)?$', r'\1', sig)
-    sig = re.sub('0x0-9a-f+', '0xXXXX', sig)
+    sig = re.sub(r'^\$0-9+\s=\s\{(.+)\}$', r'\1', sig)
+    sig = re.sub(r'^\$0-9+\s=\s\{(.+)\}(\s0x0-9a-f+\s<\w+>)+$', r'\1', sig)
+    sig = re.sub(r'^\$0-9+\s=\s(0x0-9a-f+)\s?(<\w+>)?$', r'\1', sig)
+    sig = re.sub(r'0x0-9a-f+', '0xXXXX', sig)
     sig = re.sub('", <incomplete sequence (\\\\a-z0-9+)>', r'\1"', sig)
 
     for t in abi_type_maps:
         # we need to cope with non-word characters in mapped types
         m = t
-        m = m.replace('*', '\*')
+        m = m.replace('*', r'\*')
         if m-1.isalnum() or m-1 == '_':
             m += '\\b'
         if m0.isalnum() or m0 == '_':
@@ -41,8 +41,9 @@
 
 def normalise_varargs(sig):
     '''cope with older versions of gdb'''
-    sig = re.sub(',\s\.\.\.', '', sig)
-    return sig
+    sig = re.sub(r',\s\.\.\.', '', sig)
+    # Make sure we compare bytes and not strings
+    return bytes(sig, encoding='utf-8').decode('unicode_escape')
 
 
 def parse_sigs(sigs, abi_match):

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/wafsamba/samba_autoconf.py -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/wafsamba/samba_autoconf.py Changed

@@ -364,7 +364,7 @@
     return False
 
 @conf
-def CHECK_VALUEOF(conf, v, headers=None, define=None):
+def CHECK_VALUEOF(conf, v, headers=None, define=None, lib=None):
     '''check the value of a variable/define'''
     ret = True
     v_define = define
@@ -376,6 +376,7 @@
                   execute=True,
                   define_ret=True,
                   quote=False,
+                  lib=lib,
                   headers=headers,
                   local_include=False,
                   msg="Checking value of %s" % v):
@@ -830,8 +831,10 @@
     if (Options.options.address_sanitizer or
         Options.options.undefined_sanitizer):
         conf.ADD_CFLAGS('-g -O1', testflags=True)
-    if Options.options.address_sanitizer:
+    if (Options.options.address_sanitizer
+       or Options.options.memory_sanitizer):
         conf.ADD_CFLAGS('-fno-omit-frame-pointer', testflags=True)
+    if Options.options.address_sanitizer:
         conf.ADD_CFLAGS('-fsanitize=address', testflags=True)
         conf.ADD_LDFLAGS('-fsanitize=address', testflags=True)
         conf.env'ADDRESS_SANITIZER' = True
@@ -842,6 +845,13 @@
         conf.ADD_LDFLAGS('-fsanitize=undefined', testflags=True)
         conf.env'UNDEFINED_SANITIZER' = True
 
+    # MemorySanitizer is only available if you build with clang
+    if Options.options.memory_sanitizer:
+        conf.ADD_CFLAGS('-g -O2', testflags=True)
+        conf.ADD_CFLAGS('-fsanitize=memory', testflags=True)
+        conf.ADD_CFLAGS('-fsanitize-memory-track-origins=2', testflags=True)
+        conf.ADD_LDFLAGS('-fsanitize=memory')
+        conf.env'MEMORY_SANITIZER' = True
 
     # Let people pass an additional ADDITIONAL_{CFLAGS,LDFLAGS}
     # environment variables which are only used the for final build.
@@ -883,10 +893,12 @@
             conf.envname = conf.env'PREFIX' + default
 
 @conf
-def ADD_NAMED_CFLAGS(conf, name, flags, testflags=False, prereq_flags=):
+def ADD_NAMED_CFLAGS(conf, name, flags, testflags=False, prereq_flags=None):
     '''add some CFLAGS to the command line
        optionally set testflags to ensure all the flags work
     '''
+    if prereq_flags is None:
+        prereq_flags = 
     prereq_flags = TO_LIST(prereq_flags)
     if testflags:
         ok_flags=
@@ -899,10 +911,12 @@
     conf.envname.extend(TO_LIST(flags))
 
 @conf
-def ADD_CFLAGS(conf, flags, testflags=False, prereq_flags=):
+def ADD_CFLAGS(conf, flags, testflags=False, prereq_flags=None):
     '''add some CFLAGS to the command line
        optionally set testflags to ensure all the flags work
     '''
+    if prereq_flags is None:
+        prereq_flags = 
     ADD_NAMED_CFLAGS(conf, 'EXTRA_CFLAGS', flags, testflags=testflags,
                      prereq_flags=prereq_flags)
 
@@ -969,7 +983,7 @@
     '''enable/disable cache of configure results'''
     if enable:
         # when -C is chosen, we will use a private cache and will
-        # not look into system includes. This roughtly matches what
+        # not look into system includes. This roughly matches what
         # autoconf does with -C
         cache_path = os.path.join(conf.bldnode.abspath(), '.confcache')
         mkdir_p(cache_path)
@@ -986,7 +1000,9 @@
 
 @conf
 def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
-    if Options.options.address_sanitizer or Options.options.enable_libfuzzer:
+    if (Options.options.address_sanitizer
+       or Options.options.memory_sanitizer
+       or Options.options.enable_libfuzzer):
         # Sanitizers can rely on symbols undefined at library link time and the
         # symbols used for fuzzers are only defined by compiler wrappers.
         return

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/wafsamba/samba_bundled.py -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/wafsamba/samba_bundled.py Changed

@@ -57,7 +57,7 @@
 
 
 def minimum_library_version(conf, libname, default):
-    '''allow override of mininum system library version'''
+    '''allow override of minimum system library version'''
 
     minlist = Options.options.MINIMUM_LIBRARY_VERSION
     if not minlist:
@@ -104,12 +104,14 @@
 
 @conf
 def CHECK_BUNDLED_SYSTEM_PKG(conf, libname, minversion='0.0.0',
-        maxversion=None, version_blacklist=,
+        maxversion=None, version_blacklist=None,
         onlyif=None, implied_deps=None, pkg=None):
     '''check if a library is available as a system library.
 
     This only tries using pkg-config
     '''
+    if version_blacklist is None:
+        version_blacklist = 
     return conf.CHECK_BUNDLED_SYSTEM(libname,
                                      minversion=minversion,
                                      maxversion=maxversion,
@@ -120,7 +122,7 @@
 
 @conf
 def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
-                         maxversion=None, version_blacklist=,
+                         maxversion=None, version_blacklist=None,
                          checkfunctions=None, headers=None, checkcode=None,
                          onlyif=None, implied_deps=None,
                          require_headers=True, pkg=None, set_target=True):
@@ -129,6 +131,8 @@
     tries by testing for a specified function in the specified lib
     '''
     # We always do a logic validation of 'onlyif' first
+    if version_blacklist is None:
+        version_blacklist = 
     missing = 
     if onlyif:
         for l in samba_utils.TO_LIST(onlyif):

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/wafsamba/samba_conftests.py -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/wafsamba/samba_conftests.py Changed

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/wafsamba/samba_git.py -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/wafsamba/samba_git.py Changed

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/wafsamba/samba_headers.py -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/wafsamba/samba_headers.py Changed

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/wafsamba/samba_third_party.py -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/wafsamba/samba_third_party.py Changed

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/wafsamba/samba_utils.py -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/wafsamba/samba_utils.py Changed

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/wafsamba/samba_version.py -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/wafsamba/samba_version.py Changed

@@ -235,22 +235,22 @@
 def samba_version_file(version_file, path, env=None, is_install=True):
     '''Parse the version information from a VERSION file'''
 
-    f = open(version_file, 'r')
-    version_dict = {}
-    for line in f:
-        line = line.strip()
-        if line == '':
-            continue
-        if line.startswith("#"):
-            continue
-        try:
-            split_line = line.split("=")
-            if split_line1 != "":
-                value = split_line1.strip('"')
-                version_dictsplit_line0 = value
-        except:
-            print("Failed to parse line %s from %s" % (line, version_file))
-            raise
+    with open(version_file, 'r') as f:
+        version_dict = {}
+        for line in f:
+            line = line.strip()
+            if line == '':
+                continue
+            if line.startswith("#"):
+                continue
+            try:
+                split_line = line.split("=")
+                if split_line1 != "":
+                    value = split_line1.strip('"')
+                    version_dictsplit_line0 = value
+            except:
+                print("Failed to parse line %s from %s" % (line, version_file))
+                raise
 
     return SambaVersion(version_dict, path, env=env, is_install=is_install)

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/wafsamba/samba_waf18.py -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/wafsamba/samba_waf18.py Changed

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/wafsamba/symbols.py -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/wafsamba/symbols.py Changed

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/wafsamba/wafsamba.py -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/wafsamba/wafsamba.py Changed

_service:tar_scm:talloc-2.4.0.tar.gz/buildtools/wafsamba/wscript -> _service:tar_scm:talloc-2.4.1.tar.gz/buildtools/wafsamba/wscript Changed

@@ -118,7 +118,7 @@
                    action="store_true", dest='disable_rpath_private_install', default=False)
     gr.add_option('--nonshared-binary',
                    help=(
-f'''Disable use of shared libaries internal to {Context.g_module.APPNAME} for the listed binaries.
+f'''Disable use of shared libraries internal to {Context.g_module.APPNAME} for the listed binaries.
 
 The resulting binaries are 'statically linked' with regard to components provided by
 {Context.g_module.APPNAME}, but remain dynamically linked to (eg) libc.so and libgnutls.so
@@ -189,6 +189,11 @@
         action="store_true",
         dest='undefined_sanitizer',
         default=False)
+    gr.add_option('--memory-sanitizer',
+        help=("Enable memory behaviour sanitizer compile and linker flags"),
+        action="store_true",
+        dest='memory_sanitizer',
+        default=False)
     gr.add_option('--enable-libfuzzer',
                   help=("Build fuzzing binaries (use ADDITIONAL_CFLAGS to specify compiler options for libFuzzer or use CC=honggfuzz/hfuzz-cc)"),
                   action="store_true", dest='enable_libfuzzer', default=False)
@@ -373,7 +378,7 @@
     conf.CHECK_CODE('printf("hello world")',
                     define='HAVE_SIMPLE_C_PROG',
                     mandatory=True,
-                    execute=True,
+                    execute=not conf.env.CROSS_COMPILE,
                     headers='stdio.h',
                     msg='Checking simple C program')
 
@@ -523,7 +528,8 @@
             strict=True,
             msg='Checking for __attribute__')
 
-    # Solaris by defauls uses draft versions of some functions unless you set _POSIX_PTHREAD_SEMANTICS
+    # Solaris by default uses draft versions of some functions unless you set
+    # _POSIX_PTHREAD_SEMANTICS
     if sys.platform.startswith('sunos'):
         conf.DEFINE('_POSIX_PTHREAD_SEMANTICS', 1)
 
@@ -705,11 +711,6 @@
                     define="HAVE_VA_COPY",
                     msg="Checking for va_copy")
 
-    conf.CHECK_CODE('''
-                    #define eprintf(...) fprintf(stderr, __VA_ARGS__)
-                    eprintf("bla", "bar")
-                    ''', define='HAVE__VA_ARGS__MACRO')
-
     conf.env.enable_fuzzing = False
 
     conf.env.enable_libfuzzer = Options.options.enable_libfuzzer
@@ -719,11 +720,6 @@
         conf.DEFINE('FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION', 1)
         conf.env.FUZZ_TARGET_LDFLAGS = Options.options.FUZZ_TARGET_LDFLAGS
 
-    # Create a symlink of the compile db for clangd
-    symlink(os.path.join(conf.bldnode.abspath(), 'default/compile_commands.json'),
-            os.path.join(conf.srcnode.abspath(), 'compile_commands.json'),
-            force=True)
-
     conf.SAMBA_BUILD_ENV()

_service:tar_scm:talloc-2.4.0.tar.gz/lib/replace/inet_ntop.c -> _service:tar_scm:talloc-2.4.1.tar.gz/lib/replace/inet_ntop.c Changed

_service:tar_scm:talloc-2.4.0.tar.gz/lib/replace/replace.h -> _service:tar_scm:talloc-2.4.1.tar.gz/lib/replace/replace.h Changed

_service:tar_scm:talloc-2.4.0.tar.gz/lib/replace/snprintf.c -> _service:tar_scm:talloc-2.4.1.tar.gz/lib/replace/snprintf.c Changed

_service:tar_scm:talloc-2.4.0.tar.gz/lib/replace/strptime.c -> _service:tar_scm:talloc-2.4.1.tar.gz/lib/replace/strptime.c Changed

_service:tar_scm:talloc-2.4.0.tar.gz/lib/replace/system/network.h -> _service:tar_scm:talloc-2.4.1.tar.gz/lib/replace/system/network.h Changed

_service:tar_scm:talloc-2.4.0.tar.gz/lib/replace/system/select.h -> _service:tar_scm:talloc-2.4.1.tar.gz/lib/replace/system/select.h Changed

_service:tar_scm:talloc-2.4.0.tar.gz/lib/replace/system/wscript_configure -> _service:tar_scm:talloc-2.4.1.tar.gz/lib/replace/system/wscript_configure Changed

_service:tar_scm:talloc-2.4.0.tar.gz/lib/replace/wscript -> _service:tar_scm:talloc-2.4.1.tar.gz/lib/replace/wscript Changed

@@ -44,7 +44,6 @@
     conf.CHECK_HEADERS('locale.h ndir.h pwd.h')
     conf.CHECK_HEADERS('shadow.h sys/acl.h')
     conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h')
-    conf.CHECK_HEADERS('port.h')
     conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h')
     conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h')
     conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h')
@@ -115,7 +114,7 @@
     conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
 
     conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h')
-    conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h')
+    conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h')
     conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
     conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
     conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h')
@@ -132,6 +131,9 @@
     if conf.CHECK_CFLAGS('-Wno-strict-overflow'):
         conf.define('HAVE_WNO_STRICT_OVERFLOW', '1')
 
+    if conf.CHECK_CFLAGS('-Wno-unused-but-set-variable'):
+        conf.define('HAVE_WNO_UNUSED_BUT_SET_VARIABLE', '1')
+
     if conf.CHECK_CFLAGS('-Wuse-after-free=1'):
         conf.define('HAVE_WUSE_AFTER_FREE_1', '1')
 
@@ -182,6 +184,10 @@
     conf.CHECK_TYPE('blkcnt_t', 'long', headers='sys/types.h sys/stat.h unistd.h')
 
     conf.CHECK_SIZEOF('bool char int "long long" long short size_t ssize_t')
+    sizeof_int = conf.env"SIZEOF_INT"
+    if sizeof_int < 4:
+        conf.fatal(f"Samba won't work with int of size {sizeof_int} (requires >= 4)")
+
     conf.CHECK_SIZEOF('int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t')
     conf.CHECK_SIZEOF('void*', define='SIZEOF_VOID_P')
     conf.CHECK_SIZEOF('off_t dev_t ino_t time_t')
@@ -482,7 +488,6 @@
     conf.CHECK_FUNCS('timegm getifaddrs freeifaddrs mmap setgroups syscall setsid')
     conf.CHECK_FUNCS('getgrent_r getgrgid_r getgrnam_r getgrouplist getpagesize')
     conf.CHECK_FUNCS('getpwent_r getpwnam_r getpwuid_r epoll_create')
-    conf.CHECK_FUNCS('port_create')
     conf.CHECK_FUNCS('getprogname')
     if not conf.CHECK_FUNCS('copy_file_range'):
         conf.CHECK_CODE('''
@@ -708,9 +713,6 @@
     if conf.CONFIG_SET('HAVE_EPOLL_CREATE') and conf.CONFIG_SET('HAVE_SYS_EPOLL_H'):
         conf.DEFINE('HAVE_EPOLL', 1)
 
-    if conf.CONFIG_SET('HAVE_PORT_CREATE') and conf.CONFIG_SET('HAVE_PORT_H'):
-        conf.DEFINE('HAVE_SOLARIS_PORTS', 1)
-
     if conf.CHECK_FUNCS('eventfd', headers='sys/eventfd.h'):
         conf.DEFINE('HAVE_EVENTFD', 1)

_service:tar_scm:talloc-2.4.0.tar.gz/lib/replace/xattr.c -> _service:tar_scm:talloc-2.4.1.tar.gz/lib/replace/xattr.c Changed

@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    replacement routines for xattr implementations
    Copyright (C) Jeremy Allison  1998-2005
@@ -10,7 +10,7 @@
      ** NOTE! The following LGPL license applies to the replace
      ** library. This does NOT imply that all of Samba is released
      ** under the LGPL
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
@@ -42,7 +42,7 @@
 #endif
 
 /**************************************************************************
- Wrappers for extented attribute calls. Based on the Linux package with
+ Wrappers for extended attribute calls. Based on the Linux package with
  support for IRIX and (Net|Free)BSD also. Expand as other systems have them.
 ****************************************************************************/
 
@@ -196,7 +196,7 @@
         int space;
 	const char *name;
 	size_t len;
-} 
+}
 extattr = {
 	{ EXTATTR_NAMESPACE_SYSTEM, EXTATTR_PREFIX("system.") },
         { EXTATTR_NAMESPACE_USER, EXTATTR_PREFIX("user.") },
@@ -233,7 +233,7 @@
 				errno = ENOSYS;
 				return -1;
 		}
-		/* Some error happend. Errno should be set by the previous call */
+		/* Some error happened. Errno should be set by the previous call */
 		if(list_size < 0)
 			return -1;
 		/* No attributes */
@@ -245,7 +245,7 @@
 		   problem with the emulation.
 		*/
 		if(list == NULL) {
-			/* Take the worse case of one char attribute names - 
+			/* Take the worse case of one char attribute names -
 			   two bytes per name plus one more for sanity.
 			*/
 			total_size += list_size + (list_size/2 + 1)*extattrt.len;

_service:tar_scm:talloc-2.4.0.tar.gz/pytalloc.c -> _service:tar_scm:talloc-2.4.1.tar.gz/pytalloc.c Changed

@@ -101,9 +101,9 @@
 }
 
 /**
- * Default (but only slightly more useful than the default) implementation of cmp.
+ * Default objects do not support ordered comparisons, but talloc
+ * objects do, sorting by pointers clustered by type.
  */
-#if PY_MAJOR_VERSION >= 3
 static PyObject *pytalloc_default_richcmp(PyObject *obj1, PyObject *obj2, int op)
 {
 	void *ptr1;
@@ -131,17 +131,6 @@
 	Py_INCREF(Py_NotImplemented);
 	return Py_NotImplemented;
 }
-#else
-static int pytalloc_default_cmp(PyObject *_obj1, PyObject *_obj2)
-{
-	pytalloc_Object *obj1 = (pytalloc_Object *)_obj1,
-					 *obj2 = (pytalloc_Object *)_obj2;
-	if (obj1->ob_type != obj2->ob_type)
-		return ((char *)obj1->ob_type - (char *)obj2->ob_type);
-
-	return ((char *)pytalloc_get_ptr(obj1) - (char *)pytalloc_get_ptr(obj2));
-}
-#endif
 
 static PyTypeObject TallocObject_Type = {
 	.tp_name = "talloc.Object",
@@ -150,11 +139,7 @@
 	.tp_dealloc = (destructor)pytalloc_dealloc,
 	.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
 	.tp_repr = pytalloc_default_repr,
-#if PY_MAJOR_VERSION >= 3
 	.tp_richcompare = pytalloc_default_richcmp,
-#else
-	.tp_compare = pytalloc_default_cmp,
-#endif
 };
 
 /**
@@ -181,9 +166,9 @@
 }
 
 /**
- * Default (but only slightly more useful than the default) implementation of cmp.
+ * Default objects do not support ordered comparisons, but talloc
+ * objects do, sorting by pointers clustered by type.
  */
-#if PY_MAJOR_VERSION >= 3
 static PyObject *pytalloc_base_default_richcmp(PyObject *obj1, PyObject *obj2, int op)
 {
 	void *ptr1;
@@ -211,17 +196,6 @@
 	Py_INCREF(Py_NotImplemented);
 	return Py_NotImplemented;
 }
-#else
-static int pytalloc_base_default_cmp(PyObject *_obj1, PyObject *_obj2)
-{
-	pytalloc_BaseObject *obj1 = (pytalloc_BaseObject *)_obj1,
-					 *obj2 = (pytalloc_BaseObject *)_obj2;
-	if (obj1->ob_type != obj2->ob_type)
-		return ((char *)obj1->ob_type - (char *)obj2->ob_type);
-
-	return ((char *)pytalloc_get_ptr(obj1) - (char *)pytalloc_get_ptr(obj2));
-}
-#endif
 
 static PyTypeObject TallocBaseObject_Type = {
 	.tp_name = "talloc.BaseObject",
@@ -230,11 +204,7 @@
 	.tp_dealloc = (destructor)pytalloc_base_dealloc,
 	.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
 	.tp_repr = pytalloc_base_default_repr,
-#if PY_MAJOR_VERSION >= 3
 	.tp_richcompare = pytalloc_base_default_richcmp,
-#else
-	.tp_compare = pytalloc_base_default_cmp,
-#endif
 };
 
 static PyTypeObject TallocGenericObject_Type = {
@@ -247,7 +217,6 @@
 
 #define MODULE_DOC PyDoc_STR("Python wrapping of talloc-maintained objects.")
 
-#if PY_MAJOR_VERSION >= 3
 static struct PyModuleDef moduledef = {
     PyModuleDef_HEAD_INIT,
     .m_name = "talloc",
@@ -255,7 +224,6 @@
     .m_size = -1,
     .m_methods = talloc_methods,
 };
-#endif
 
 static PyObject *module_init(void);
 static PyObject *module_init(void)
@@ -271,11 +239,7 @@
 	if (PyType_Ready(&TallocGenericObject_Type) < 0)
 		return NULL;
 
-#if PY_MAJOR_VERSION >= 3
 	m = PyModule_Create(&moduledef);
-#else
-	m = Py_InitModule3("talloc", talloc_methods, MODULE_DOC);
-#endif
 	if (m == NULL)
 		return NULL;
 
@@ -298,16 +262,8 @@
 	return NULL;
 }
 
-#if PY_MAJOR_VERSION >= 3
 PyMODINIT_FUNC PyInit_talloc(void);
 PyMODINIT_FUNC PyInit_talloc(void)
 {
 	return module_init();
 }
-#else
-void inittalloc(void);
-void inittalloc(void)
-{
-	module_init();
-}
-#endif

_service:tar_scm:talloc-2.4.0.tar.gz/pytalloc_guide.txt -> _service:tar_scm:talloc-2.4.1.tar.gz/pytalloc_guide.txt Changed

_service:tar_scm:talloc-2.4.0.tar.gz/pytalloc_util.c -> _service:tar_scm:talloc-2.4.1.tar.gz/pytalloc_util.c Changed

_service:tar_scm:talloc-2.4.0.tar.gz/talloc.c -> _service:tar_scm:talloc-2.4.1.tar.gz/talloc.c Changed

@@ -146,7 +146,7 @@
 } while (0)
 
 #if defined(DEVELOPER) && defined(VALGRIND_MAKE_MEM_NOACCESS)
-/* Mark the whole chunk as not accessable */
+/* Mark the whole chunk as not accessible */
 #define TC_INVALIDATE_FULL_VALGRIND_CHUNK(_tc) do { \
 	size_t _flen = TC_HDR_SIZE + (_tc)->size; \
 	char *_fptr = (char *)(_tc); \
@@ -171,7 +171,7 @@
 } while (0)
 
 #if defined(DEVELOPER) && defined(VALGRIND_MAKE_MEM_NOACCESS)
-/* Mark the unused bytes not accessable */
+/* Mark the unused bytes not accessible */
 #define TC_INVALIDATE_SHRINK_VALGRIND_CHUNK(_tc, _new_size) do { \
 	size_t _flen = (_tc)->size - (_new_size); \
 	char *_fptr = (char *)TC_PTR_FROM_CHUNK(_tc); \
@@ -661,7 +661,7 @@
 	return tc_next_chunk(tc);
 }
 
-/* Mark the whole remaining pool as not accessable */
+/* Mark the whole remaining pool as not accessible */
 static inline void tc_invalidate_pool(struct talloc_pool_hdr *pool_hdr)
 {
 	size_t flen = tc_pool_space_left(pool_hdr);
@@ -2598,7 +2598,6 @@
 	struct talloc_chunk *tc = NULL;
 	char buf1024;
 
-	/* this call looks strange, but it makes it work on older solaris boxes */
 	va_copy(ap2, ap);
 	vlen = vsnprintf(buf, sizeof(buf), fmt, ap2);
 	va_end(ap2);
@@ -2662,6 +2661,7 @@
 	char c;
 
 	va_copy(ap2, ap);
+	/* this call looks strange, but it makes it work on older solaris boxes */
 	alen = vsnprintf(&c, 1, fmt, ap2);
 	va_end(ap2);
 
@@ -2678,9 +2678,7 @@
 	s = talloc_realloc(NULL, s, char, slen + alen + 1);
 	if (!s) return NULL;
 
-	va_copy(ap2, ap);
-	vsnprintf(s + slen, alen + 1, fmt, ap2);
-	va_end(ap2);
+	vsnprintf(s + slen, alen + 1, fmt, ap);
 
 	_tc_set_name_const(talloc_chunk_from_ptr(s), s);
 	return s;

_service:tar_scm:talloc-2.4.0.tar.gz/talloc.h -> _service:tar_scm:talloc-2.4.1.tar.gz/talloc.h Changed

@@ -666,6 +666,19 @@
 _PUBLIC_ const char *talloc_parent_name(const void *ptr);
 
 /**
+ * @brief Get the size of a talloc chunk.
+ *
+ * This function lets you know the amount of memory allocated so far by
+ * this context. It does NOT account for subcontext memory.
+ * This can be used to calculate the size of an array.
+ *
+ * @paramin  ctx      The talloc chunk.
+ *
+ * @return              The size of the talloc chunk.
+ */
+_PUBLIC_ size_t talloc_get_size(const void *ctx);
+
+/**
  * @brief Get the total size of a talloc chunk including its children.
  *
  * The function returns the total size in bytes used by this pointer and all
@@ -1071,19 +1084,6 @@
 _PUBLIC_ void *talloc_autofree_context(void) _DEPRECATED_;
 
 /**
- * @brief Get the size of a talloc chunk.
- *
- * This function lets you know the amount of memory allocated so far by
- * this context. It does NOT account for subcontext memory.
- * This can be used to calculate the size of an array.
- *
- * @paramin  ctx      The talloc chunk.
- *
- * @return              The size of the talloc chunk.
- */
-_PUBLIC_ size_t talloc_get_size(const void *ctx);
-
-/**
  * @brief Show the parentage of a context.
  *
  * @paramin  context            The talloc context to look at.

_service:tar_scm:talloc-2.4.0.tar.gz/test_pytalloc.c -> _service:tar_scm:talloc-2.4.1.tar.gz/test_pytalloc.c Changed

_service:tar_scm:talloc-2.4.0.tar.gz/wscript -> _service:tar_scm:talloc-2.4.1.tar.gz/wscript Changed

Changes of Revision 3