- (bal) Missed msg.[ch] in merge. Required for ssh-keysign.

[openssh.git] / monitor_mm.c

diff --git a/monitor_mm.c b/monitor_mm.c
index 17b319cce2fbecb0ed7fb91702fa99ceacf70b7a..30c9825e342c1660894893aab1a93808cc8c04c9 100644 (file)
--- a/monitor_mm.c
+++ b/monitor_mm.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_mm.c,v 1.5 2002/05/28 16:45:27 stevesk Exp $");
+RCSID("$OpenBSD: monitor_mm.c,v 1.6 2002/06/04 23:05:49 markus Exp $");
 
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
@@ -91,7 +91,7 @@ mm_create(struct mm_master *mmalloc, size_t size)
                fatal("mmap(%lu): %s", (u_long)size, strerror(errnor));
 #else
        fatal("%s: UsePrivilegeSeparation=yes not supported",
-           __FUNCTION__);
+           __func__);
 #endif
 
        mm->address = address;
@@ -136,7 +136,7 @@ mm_destroy(struct mm_master *mm)
                    strerror(errno));
 #else
        fatal("%s: UsePrivilegeSeparation=yes not supported",
-           __FUNCTION__);
+           __func__);
 #endif
        if (mm->mmalloc == NULL)
                xfree(mm);
@@ -151,7 +151,7 @@ mm_xmalloc(struct mm_master *mm, size_t size)
 
        address = mm_malloc(mm, size);
        if (address == NULL)
-               fatal("%s: mm_malloc(%lu)", __FUNCTION__, (u_long)size);
+               fatal("%s: mm_malloc(%lu)", __func__, (u_long)size);
        return (address);
 }
 
@@ -300,7 +300,7 @@ mm_share_sync(struct mm_master **pmm, struct mm_master **pmmalloc)
        struct mm_master *mmold;
        struct mmtree rb_free, rb_allocated;
 
-       debug3("%s: Share sync", __FUNCTION__);
+       debug3("%s: Share sync", __func__);
 
        mm = *pmm;
        mmold = mm->mmalloc;
@@ -325,7 +325,7 @@ mm_share_sync(struct mm_master **pmm, struct mm_master **pmmalloc)
        *pmm = mm;
        *pmmalloc = mmalloc;
 
-       debug3("%s: Share sync end", __FUNCTION__);
+       debug3("%s: Share sync end", __func__);
 }
 
 void