From 839d456ed6c838e83340e5c16958845c27bd8d8d Mon Sep 17 00:00:00 2001 From: Zofia Abramowska Date: Thu, 27 Mar 2014 15:08:51 +0100 Subject: [PATCH] Rewrite macro defines as consts Removing unnecessary macros and replace them with const variables. Change-Id: I867e54eebbd4e01ca7947abf67a5642c6f965c2e --- tests/libsmack-tests/test_cases.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/libsmack-tests/test_cases.cpp b/tests/libsmack-tests/test_cases.cpp index 8a02c3c..d5f72e0 100644 --- a/tests/libsmack-tests/test_cases.cpp +++ b/tests/libsmack-tests/test_cases.cpp @@ -41,14 +41,17 @@ #include "tests_common.h" #include -#define TEST_SUBJECT "test_subject" -#define TEST_OBJECT "test_oject" -#define TEST_OBJECT_2 "test_oject_2" +const char* const TEST_SUBJECT = "test_subject"; +const char* const TEST_OBJECT = "test_object"; +const char* const TEST_OBJECT_2 = "test_object_2"; +const std::string testDir = "/opt/home/app/"; +const std::vector accessesBasic = { "r", "w", "x", "wx", "rx", "rw", "rwx", "rwxat" }; + +//This one define is required for sockaddr_un initialization #define SOCK_PATH "/tmp/test-smack-socket" -std::string testDir = "/opt/home/app/"; -std::vector accessesBasic = { "r", "w", "x", "wx", "rx", "rw", "rwx", "rwxat" }; + int files_compare(int fd1, int fd2) { -- 2.7.4