diff options
| author |   Giovanni Conte <gconte@cisco.com> | 2019-01-16 12:09:43 +0100 |
|---|---|---|
| committer | Giovanni Conte <gconte@cisco.com> | 2019-01-16 18:15:26 +0100 |
| commit | 33b53c7f5cef4cf19770a38baa4b627f234322cf (patch) | |
| tree | 619dc322af2616fea2c97d812b69131aa26f45a8 /libparc/parc/algol/parc_File.c | |
| parent | db496684a300b2d65ae7739c918177111d5a3500 (diff) | |
removed longbow dependency
Change-Id: I0c224b26261c7b24699410fc5e41ed6f3fab9815
Signed-off-by: Giovanni Conte <gconte@cisco.com>
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 { |