Colin's const-fixing Patch Of Death. Seems to build fine on Windows

[u/mdw/putty] / logging.c

diff --git a/logging.c b/logging.c
index d27c727..f32e9ca 100644 (file)
--- a/logging.c
+++ b/logging.c
@@ -43,7 +43,7 @@ void logtraffic(void *handle, unsigned char c, int logmode)
  * platforms. Platforms which don't have a meaningful stderr can
  * just avoid defining FLAG_STDERR.
  */
-void log_eventlog(void *handle, char *event)
+void log_eventlog(void *handle, const char *event)
 {
     struct LogContext *ctx = (struct LogContext *)handle;
     if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE)) {
@@ -146,7 +146,7 @@ void logfopen(void *handle)
                 ctx->cfg.logtype == LGTYP_DEBUG ? "raw" :
                 ctx->cfg.logtype == LGTYP_PACKETS ? "SSH packets" : "<ukwn>"));
        /* Make sure we do not exceed the output buffer size */
-       strncat(buf, filename_to_str(ctx->currlogfilename), 128);
+       strncat(buf, filename_to_str(&ctx->currlogfilename), 128);
        buf[strlen(buf)] = '\0';
        logevent(ctx->frontend, buf);
     }
@@ -163,7 +163,7 @@ void logfclose(void *handle)
 
 void *log_init(void *frontend, Config *cfg)
 {
-    struct LogContext *ctx = smalloc(sizeof(struct LogContext));
+    struct LogContext *ctx = snew(struct LogContext);
     ctx->lgfp = NULL;
     ctx->frontend = frontend;
     ctx->cfg = *cfg;                  /* STRUCTURE COPY */
@@ -210,10 +210,11 @@ static void xlatlognam(Filename *dest, Filename src,
     int size;
     char buffer[FILENAME_MAX];
     int len = sizeof(buffer)-1;
-    char *d, *s;
+    char *d;
+    const char *s;
 
     d = buffer;
-    s = filename_to_str(src);
+    s = filename_to_str(&src);
 
     while (*s) {
        /* Let (bufp, len) be the string to append. */
@@ -257,5 +258,5 @@ static void xlatlognam(Filename *dest, Filename src,
     }
     *d = '\0';
 
-    *dest = filename_from_str(s);
+    *dest = filename_from_str(buffer);
 }