diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-07-04 17:17:09 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-07-04 17:17:09 +0300 |
| commit | cc78bdc31749e9754120ae5a9d4849f4832b40a4 (patch) | |
| tree | 4f9e3f2064e56651ed8d41ae9d8ce8b08fc5241b /lib/cycle-check.c | |
| parent | 8425beb209e6fedf50bcdd934ced14dfa0d7b596 (diff) | |
| parent | 71cd8e3a743046573744123777061b64881bf372 (diff) | |
| download | coreutils-cc78bdc31749e9754120ae5a9d4849f4832b40a4.tar.gz | |
Merge tag 'upstream/8.24'
Upstream version 8.24
Conflicts:
INSTALL
Makefile.in
aclocal.m4
build-aux/config.guess
build-aux/config.rpath
build-aux/config.sub
build-aux/depcomp
build-aux/missing
build-aux/test-driver
build-aux/texinfo.tex
doc/coreutils.info
doc/stamp-vti
doc/version.texi
gnulib-tests/Makefile.in
po/Makefile.in.in
Diffstat (limited to 'lib/cycle-check.c')
| -rw-r--r-- | lib/cycle-check.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/cycle-check.c b/lib/cycle-check.c index f7b3d078..a198b091 100644 --- a/lib/cycle-check.c +++ b/lib/cycle-check.c @@ -1,6 +1,6 @@ /* help detect directory cycles efficiently - Copyright (C) 2003-2006, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,15 +19,15 @@ #include <config.h> +#include "cycle-check.h" + #include <sys/types.h> #include <sys/stat.h> #include <stdio.h> -#include <assert.h> #include <stdlib.h> - #include <stdbool.h> -#include "cycle-check.h" +#include "assure.h" #define CC_MAGIC 9827862 @@ -57,7 +57,7 @@ cycle_check_init (struct cycle_check_state *state) bool cycle_check (struct cycle_check_state *state, struct stat const *sb) { - assert (state->magic == CC_MAGIC); + assure (state->magic == CC_MAGIC); /* If the current directory ever happens to be the same as the one we last recorded for the cycle detection, |