commit 281a9ba465ba8be0d58fcb690ec34f9cdacdd1a9
Author: Oswald Buddenhagen <o...@users.sf.net>
Date:   Tue Mar 11 12:44:22 2025 +0100

    prefix deprecation notices with file name
    
    so it's (even) more obvious that these refer to the configuration,
    rather than being some internal sloppiness.

 src/config.c   | 6 +++---
 src/drv_imap.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/config.c b/src/config.c
index 4ff389e..3ea4837 100644
--- a/src/config.c
+++ b/src/config.c
@@ -660,11 +660,11 @@ load_config( const char *where )
        }
        fclose (cfile.fp);
        if (cfile.ms_warn)
-               warn( "Notice: Master/Slave are deprecated; use Far/Near 
instead.\n" );
+               warn( "%s: notice: Master/Slave are deprecated; use Far/Near 
instead.\n", cfile.file );
        if (cfile.renew_warn)
-               warn( "Notice: ReNew is deprecated; use Upgrade instead.\n" );
+               warn( "%s: notice: ReNew is deprecated; use Upgrade 
instead.\n", cfile.file );
        if (cfile.delete_warn)
-               warn( "Notice: Delete is deprecated; use Gone instead.\n" );
+               warn( "%s: notice: Delete is deprecated; use Gone instead.\n", 
cfile.file );
        cfile.err |= merge_ops( gcops, global_conf.ops, "" );
        if (!global_conf.sync_state) {
                const char *state_home = getenv( "XDG_STATE_HOME" );
diff --git a/src/drv_imap.c b/src/drv_imap.c
index b0be1fd..9b170ab 100644
--- a/src/drv_imap.c
+++ b/src/drv_imap.c
@@ -3824,7 +3824,7 @@ imap_parse_store( conffile_t *cfg, store_conf_t **storep )
                        static int sslv_warned;
                        if (!sslv_warned) {
                                sslv_warned = 1;
-                               warn( "Notice: SSLVersions is deprecated. Use 
TLSVersions instead.\n" );
+                               warn( "%s: notice: SSLVersions is deprecated. 
Use TLSVersions instead.\n", cfg->file );
                        }
                        server->sconf.ssl_versions = 0;
                        arg = cfg->val;
@@ -3864,7 +3864,7 @@ imap_parse_store( conffile_t *cfg, store_conf_t **storep )
                        static int sslt_warned;
                        if (!sslt_warned) {
                                sslt_warned = 1;
-                               warn( "Notice: SSLType is deprecated. Use 
TLSType instead.\n" );
+                               warn( "%s: notice: SSLType is deprecated. Use 
TLSType instead.\n", cfg->file );
                        }
                  tlstype:
                        if (!strcasecmp( "None", cfg->val )) {


_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel

Reply via email to