summaryrefslogtreecommitdiffstats
path: root/ospf6d
diff options
context:
space:
mode:
authorhasso <hasso>2004-03-04 17:45:00 +0000
committerhasso <hasso>2004-03-04 17:45:00 +0000
commit9b1ed4c5c6b1f917047f4e8d9c4e046c7e69e8e1 (patch)
tree80a92f6ee7bdab3dc9e8303de2a4047ace6c4c1b /ospf6d
parentcf26c4f3f49d613cddb25d3200438cba831f5c95 (diff)
downloadquagga-9b1ed4c5c6b1f917047f4e8d9c4e046c7e69e8e1.tar.bz2
quagga-9b1ed4c5c6b1f917047f4e8d9c4e046c7e69e8e1.tar.xz
Many warning fixes from PC Drew ([quagga-dev 940]) and removing using PAGER
from vtysh ([quagga-dev 932]).
Diffstat (limited to 'ospf6d')
-rw-r--r--ospf6d/ospf6_damp.c8
-rw-r--r--ospf6d/ospf6_main.c6
2 files changed, 10 insertions, 4 deletions
diff --git a/ospf6d/ospf6_damp.c b/ospf6d/ospf6_damp.c
index 878c48f6..40cf798d 100644
--- a/ospf6d/ospf6_damp.c
+++ b/ospf6d/ospf6_damp.c
@@ -279,7 +279,7 @@ ospf6_damp_stop (struct ospf6_damp_info *di)
gettimeofday (&now, NULL);
zlog_info ("DAMP: %lu.%06lu stop damping: %ld: type: %d, name: %s",
now.tv_sec, now.tv_usec,
- t_now, di->type, namebuf);
+ (long)t_now, di->type, namebuf);
}
/* set flag indicates that we're damping this target */
@@ -435,7 +435,7 @@ ospf6_damp_event (damp_event_t event_type,
gettimeofday (&now, NULL);
zlog_info ("DAMP: %lu.%06lu stop damping: %ld: type: %d, name: %s",
now.tv_sec, now.tv_usec,
- t_now, di->type, namebuf);
+ (long)t_now, di->type, namebuf);
}
di->damping = OFF;
}
@@ -450,7 +450,7 @@ ospf6_damp_event (damp_event_t event_type,
gettimeofday (&now, NULL);
zlog_info ("DAMP: %lu.%06lu start damping: %ld: type: %d, name: %s",
now.tv_sec, now.tv_usec,
- t_now, type, namebuf);
+ (long)t_now, type, namebuf);
}
di->damping = ON;
}
@@ -471,7 +471,7 @@ ospf6_damp_event (damp_event_t event_type,
gettimeofday (&now, NULL);
zlog_info ("DAMP: %lu.%06lu start damping: %ld: type: %d, name: %s",
now.tv_sec, now.tv_usec,
- t_now, type, namebuf);
+ (long) t_now, type, namebuf);
}
di->damping = ON;
}
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index be46f3fe..f0a23ebc 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -97,7 +97,13 @@ struct thread_master *master;
char *pid_file = PATH_OSPF6D_PID;
/* for reload */
+
+#ifdef MAXPATHLEN
+char _cwd[MAXPATHLEN];
+#else
char _cwd[64];
+#endif
+
char _progpath[64];
int _argc;
char **_argv;