summaryrefslogtreecommitdiff
blob: 44bcc3ed6819f6d68057274607de841a427925ea (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
diff -Naur csync-0.50.0.orig/modules/csync_smb.c csync-0.50.0/modules/csync_smb.c
--- csync-0.50.0.orig/modules/csync_smb.c	2013-07-29 14:04:37.000000000 +0200
+++ csync-0.50.0/modules/csync_smb.c	2018-12-06 23:08:05.320992985 +0100
@@ -49,7 +49,7 @@
     char *pw, int pwlen)
 {
   static int try_krb5 = 1;
-  char *h;
+  const char *h;
 
   (void) smb_ctx;
   (void) shr;
diff -Naur csync-0.50.0.orig/src/csync_log.h csync-0.50.0/src/csync_log.h
--- csync-0.50.0.orig/src/csync_log.h	2013-07-29 14:04:37.000000000 +0200
+++ csync-0.50.0/src/csync_log.h	2018-12-06 23:11:34.280239832 +0100
@@ -55,7 +55,7 @@
 };
 
 #define CSYNC_LOG(priority, ...) \
-  csync_log(priority, __FUNCTION__, __VA_ARGS__)
+  csync_log(priority, __func__, __VA_ARGS__)
 
 void csync_log(int verbosity,
                const char *function,
diff -Naur csync-0.50.0.orig/tests/csync_tests/check_csync_log.c csync-0.50.0/tests/csync_tests/check_csync_log.c
--- csync-0.50.0.orig/tests/csync_tests/check_csync_log.c	2013-04-22 13:00:35.000000000 +0200
+++ csync-0.50.0/tests/csync_tests/check_csync_log.c	2018-12-06 23:11:34.280239832 +0100
@@ -115,7 +115,7 @@
     rc = csync_set_log_callback(check_log_callback);
     assert_int_equal(rc, 0);
 
-    csync_log(1, __FUNCTION__, "rc = %d", rc);
+    csync_log(1, __func__, "rc = %d", rc);
 
     rc = _tstat(path, &sb);