[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  39a083b1 Add missing semicolon in man page
       via  202b7b18 Tweak alloc args to size_t w/proper realloc order.
      from  20934382 Use normal C comment style.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 39a083b16b6d229f32078569ea8bd2c4bb29a44b
Author: Christian Hesse <mail at eworm.de>
Date:   Wed Jun 24 14:06:56 2020 +0200

    Add missing semicolon in man page
    
    All nginx configuration directives end in semicolon.

commit 202b7b18affaebea34539473515a7ce2aa41b778
Author: Wayne Davison <wayne at opencoder.net>
Date:   Wed Jun 24 17:35:02 2020 -0700

    Tweak alloc args to size_t w/proper realloc order.

-----------------------------------------------------------------------

Summary of changes:
 rsync.h          | 2 +-
 rsyncd.conf.5.md | 2 +-
 util.c           | 2 +-
 util2.c          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/rsync.h b/rsync.h
index 8af83ecf..a645f201 100644
--- a/rsync.h
+++ b/rsync.h
@@ -1267,7 +1267,7 @@ extern int errno;
 #define new0(type) ((type*)calloc(1, sizeof (type)))
 #define new_array(type, num) ((type*)_new_array((num), sizeof (type), 0))
 #define new_array0(type, num) ((type*)_new_array((num), sizeof (type), 1))
-#define realloc_array(ptr, type, num) ((type*)_realloc_array((ptr), sizeof(type), (num)))
+#define realloc_array(ptr, type, num) ((type*)_realloc_array((ptr), (num), sizeof (type)))
 
 /* use magic gcc attributes to catch format errors */
  void rprintf(enum logcode , const char *, ...)
diff --git a/rsyncd.conf.5.md b/rsyncd.conf.5.md
index bc5a571b..4da26b62 100644
--- a/rsyncd.conf.5.md
+++ b/rsyncd.conf.5.md
@@ -1105,7 +1105,7 @@ An example nginx proxy setup is as follows:
 >        listen [::]:874 ssl;
 >
 >        ssl_certificate /etc/letsencrypt/example.com/fullchain.pem;
->        ssl_certificate_key /etc/letsencrypt/example.com/privkey.pem
+>        ssl_certificate_key /etc/letsencrypt/example.com/privkey.pem;
 >
 >        proxy_pass localhost:873;
 >        proxy_protocol on; # Requires "proxy protocol = true"
diff --git a/util.c b/util.c
index 84dcac52..6489e650 100644
--- a/util.c
+++ b/util.c
@@ -1655,7 +1655,7 @@ void *expand_item_list(item_list *lp, size_t item_size, const char *desc, int in
 		if (new_size <= lp->malloced)
 			overflow_exit("expand_item_list");
 		/* Using _realloc_array() lets us pass the size, not a type. */
-		new_ptr = _realloc_array(lp->items, item_size, new_size);
+		new_ptr = _realloc_array(lp->items, new_size, item_size);
 		if (DEBUG_GTE(FLIST, 3)) {
 			rprintf(FINFO, "[%s] expand %s to %s bytes, did%s move\n",
 				who_am_i(), desc, big_num(new_size * item_size),
diff --git a/util2.c b/util2.c
index ad7b0636..89e2f375 100644
--- a/util2.c
+++ b/util2.c
@@ -69,14 +69,14 @@ int msleep(int t)
 
 #define MALLOC_MAX 0x40000000
 
-void *_new_array(unsigned long num, unsigned int size, int use_calloc)
+void *_new_array(size_t num, size_t size, int use_calloc)
 {
 	if (num >= MALLOC_MAX/size)
 		return NULL;
 	return use_calloc ? calloc(num, size) : malloc(num * size);
 }
 
-void *_realloc_array(void *ptr, unsigned int size, size_t num)
+void *_realloc_array(void *ptr, size_t num, size_t size)
 {
 	if (num >= MALLOC_MAX/size)
 		return NULL;


-- 
The rsync repository.