[src/netbsd-1-4]: src/libexec/lfs_cleanerd pullup 1.14->1.15 (perseant)

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c367dd3309d5
branches:  netbsd-1-4
changeset: 469150:c367dd3309d5
user:      perry <perry%NetBSD.org@localhost>
date:      Thu Jul 01 19:53:23 1999 +0000

description:
pullup 1.14->1.15 (perseant)

diffstat:

 libexec/lfs_cleanerd/cleanerd.c |  26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diffs (88 lines):

diff -r 7971b4ff0290 -r c367dd3309d5 libexec/lfs_cleanerd/cleanerd.c
--- a/libexec/lfs_cleanerd/cleanerd.c   Thu Jul 01 19:51:29 1999 +0000
+++ b/libexec/lfs_cleanerd/cleanerd.c   Thu Jul 01 19:53:23 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cleanerd.c,v 1.13.2.1 1999/06/25 20:52:37 perry Exp $  */
+/*     $NetBSD: cleanerd.c,v 1.13.2.2 1999/07/01 19:53:23 perry Exp $  */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)cleanerd.c 8.5 (Berkeley) 6/10/95";
 #else
-__RCSID("$NetBSD: cleanerd.c,v 1.13.2.1 1999/06/25 20:52:37 perry Exp $");
+__RCSID("$NetBSD: cleanerd.c,v 1.13.2.2 1999/07/01 19:53:23 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -154,7 +154,7 @@
                 * priority = ((seg_size - live) * age) / (seg_size + live)
                 */
                if (live < 0 || live > seg_size(lfsp)) {
-                        syslog(LOG_NOTICE,"bad segusage count: %d", live);
+                        syslog(LOG_NOTICE,"bad segusage count: %ld", live);
                        live = 0;
                }
                return (lblkno(lfsp, seg_size(lfsp) - live) * age)
@@ -417,9 +417,9 @@
        sp=segs;
        for(j=0; j < total && sp->sl_bytes == 0; j++) {
                if(debug)
-                       syslog(LOG_DEBUG,"Wiping empty segment %d",sp->sl_id);
+                       syslog(LOG_DEBUG,"Wiping empty segment %ld",sp->sl_id);
                if(lfs_segclean(&fsp->fi_statfsp->f_fsid, sp->sl_id) < 0)
-                       syslog(LOG_NOTICE,"lfs_segclean failed empty segment %d: %m", sp->sl_id);
+                       syslog(LOG_NOTICE,"lfs_segclean failed empty segment %ld: %m", sp->sl_id);
                 ++cleaner_stats.segs_empty;
                sp++;
                i--;
@@ -435,7 +435,7 @@
                nsegs = fsp->fi_cip->clean;
 
         if(debug > 1)
-            syslog(LOG_DEBUG, "clean_fs: found %d segments to clean in file system %s",
+            syslog(LOG_DEBUG, "clean_fs: found %ld segments to clean in file system %s",
                    i, fsp->fi_statfsp->f_mntonname);
 
        if (i) {
@@ -446,14 +446,14 @@
                        for (; i && cleaned_bytes < to_clean;
                            i--, ++sp) {
                                if (clean_segment(fsp, sp) < 0)
-                                       syslog(LOG_NOTICE,"clean_segment failed segment %d: %m", sp->sl_id);
+                                       syslog(LOG_NOTICE,"clean_segment failed segment %ld: %m", sp->sl_id);
                                else if (lfs_segclean(&fsp->fi_statfsp->f_fsid,
                                                      sp->sl_id) < 0)
-                                       syslog(LOG_NOTICE,"lfs_segclean failed segment %d: %m", sp->sl_id);
+                                       syslog(LOG_NOTICE,"lfs_segclean failed segment %ld: %m", sp->sl_id);
                                else {
                                        if(debug) {
                                                syslog(LOG_DEBUG,
-                                                      "Cleaned segment %d (%d->%ld/%ld)",
+                                                      "Cleaned segment %ld (%ld->%ld/%ld)",
                                                       sp->sl_id,
                                                       (1<<fsp->fi_lfs.lfs_segshift) - sp->sl_bytes,
                                                       cleaned_bytes + (1<<fsp->fi_lfs.lfs_segshift) - sp->sl_bytes,
@@ -465,17 +465,17 @@
                } else
                        for (i = MIN(i, nsegs); i-- ; ++sp) {
                                total--;
-                               syslog(LOG_DEBUG,"Cleaning segment %d (of %d choices)", sp->sl_id, i+1);
+                               syslog(LOG_DEBUG,"Cleaning segment %ld (of %ld choices)", sp->sl_id, i+1);
                                if (clean_segment(fsp, sp) < 0) {
-                                       syslog(LOG_NOTICE,"clean_segment failed segment %d: %m", sp->sl_id);
+                                       syslog(LOG_NOTICE,"clean_segment failed segment %ld: %m", sp->sl_id);
                                        if(total)
                                                i++;
                                }
                                else if (lfs_segclean(&fsp->fi_statfsp->f_fsid,
                                    sp->sl_id) < 0)
-                                       syslog(LOG_NOTICE,"lfs_segclean failed segment %d: %m", sp->sl_id);
+                                       syslog(LOG_NOTICE,"lfs_segclean failed segment %ld: %m", sp->sl_id);
                                else if(debug)
-                                       syslog(LOG_DEBUG,"Completed cleaning segment %d (of %d choices)", sp->sl_id, i+1);
+                                       syslog(LOG_DEBUG,"Completed cleaning segment %ld (of %ld choices)", sp->sl_id, i+1);
                        }
        }
        free(segs);