diff options
author | Luca Muscariello <lumuscar+fdio@cisco.com> | 2019-01-24 16:32:25 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2019-01-24 16:32:25 +0000 |
commit | 9fc2b9ec49c54ec2d5f0164bbedc1c78732c464c (patch) | |
tree | c7ebcf4c83b5c2f71318bc69c6f6915aaac7ae2a /libparc/parc/algol/parc_File.c | |
parent | cada1143501a48effc483e3873596c22849926b5 (diff) | |
parent | 097e69e6daeefc84fd271babbdc1b47dfe4c01e5 (diff) |
Merge "Add support for ubuntu18.04 packages."
Diffstat (limited to 'libparc/parc/algol/parc_File.c')
-rw-r--r-- | libparc/parc/algol/parc_File.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libparc/parc/algol/parc_File.c b/libparc/parc/algol/parc_File.c index 2ab307a2..353ffcca 100644 --- a/libparc/parc/algol/parc_File.c +++ b/libparc/parc/algol/parc_File.c @@ -37,7 +37,7 @@ #include <string.h> #include <errno.h> -#include <LongBow/runtime.h> +#include <parc/assert/parc_Assert.h> #include <parc/algol/parc_Object.h> #include <parc/algol/parc_PathName.h> @@ -66,8 +66,8 @@ parcObject_Override(PARCFile, PARCObject, void parcFile_AssertValid(const PARCFile *instance) { - trapIllegalValueIf(instance == NULL, "Parameter must be a non-null pointer to a valid PARCFile."); - trapIllegalValueIf(instance->pathName == NULL, "PARCFile cannot have a NULL path-name"); + parcTrapIllegalValueIf(instance == NULL, "Parameter must be a non-null pointer to a valid PARCFile."); + parcTrapIllegalValueIf(instance->pathName == NULL, "PARCFile cannot have a NULL path-name"); } PARCFile * @@ -194,10 +194,10 @@ parcFile_Delete(const PARCFile *file) char *string = parcPathName_ToString(file->pathName); // only allow under tmp - assertTrue(strncmp(string, "/tmp/", 5) == 0, + parcAssertTrue(strncmp(string, "/tmp/", 5) == 0, "Path must begin with /tmp/: %s", string); // dont allow ".." - assertNull(strstr(string, ".."), "Path cannot have .. in it: %s", string); + parcAssertNull(strstr(string, ".."), "Path cannot have .. in it: %s", string); bool result = false; if (parcFile_IsDirectory(file)) { @@ -208,7 +208,7 @@ parcFile_Delete(const PARCFile *file) int maximumFileDescriptors = 20; int failure = nftw(string, _deleteNode, maximumFileDescriptors, flags); - assertFalse(failure, "Error on recursive delete: (%d) %s", errno, strerror(errno)); + parcAssertFalse(failure, "Error on recursive delete: (%d) %s", errno, strerror(errno)); result = failure == false; } else { |