diff options
| author | David M. Syzdek <syzdek@bindlebinaries.com> | 2017-07-07 19:57:27 -0800 |
|---|---|---|
| committer | David M. Syzdek <syzdek@bindlebinaries.com> | 2017-07-07 19:57:27 -0800 |
| commit | 7248da418913651d473e405f316c7ac6b886750c (patch) | |
| tree | ddc8a00d2683d9499629451096b8ec348feb463f | |
| parent | 5c3ed9ae102401d82ff1fb3c9c3587876dff5f41 (diff) | |
| download | securecoreutils-7248da418913651d473e405f316c7ac6b886750c.tar.gz securecoreutils-7248da418913651d473e405f316c7ac6b886750c.tar.bz2 securecoreutils-7248da418913651d473e405f316c7ac6b886750c.tar.xz securecoreutils-7248da418913651d473e405f316c7ac6b886750c.zip | |
Cleaning up pragmas.
| -rw-r--r-- | src/securecoreutils.c | 2 | ||||
| -rw-r--r-- | src/securecoreutils.h | 2 | ||||
| -rw-r--r-- | src/widget-cat.h | 4 | ||||
| -rw-r--r-- | src/widget-pathcheck.h | 4 | ||||
| -rw-r--r-- | src/widget-rm.h | 4 | ||||
| -rw-r--r-- | src/widget-rmdir.h | 4 | ||||
| -rw-r--r-- | src/widget-tail.c | 19 | ||||
| -rw-r--r-- | src/widget-tail.h | 4 | ||||
| -rw-r--r-- | src/widget-zcat.c | 7 | ||||
| -rw-r--r-- | src/widget-zcat.h | 4 |
10 files changed, 33 insertions, 21 deletions
diff --git a/src/securecoreutils.c b/src/securecoreutils.c index f99b5ae..00f143b 100644 --- a/src/securecoreutils.c +++ b/src/securecoreutils.c | |||
| @@ -89,7 +89,7 @@ const scu_widget * scu_widget_lookup(const char * wname, int exact); | |||
| 89 | // Variables // | 89 | // Variables // |
| 90 | // // | 90 | // // |
| 91 | ///////////////// | 91 | ///////////////// |
| 92 | #ifdef __TALLYMARK_PMARK | 92 | #ifdef __SECURECOREUTILS_PMARK |
| 93 | #pragma mark - Variables | 93 | #pragma mark - Variables |
| 94 | #endif | 94 | #endif |
| 95 | 95 | ||
diff --git a/src/securecoreutils.h b/src/securecoreutils.h index bd8534e..daa21d7 100644 --- a/src/securecoreutils.h +++ b/src/securecoreutils.h | |||
| @@ -152,7 +152,7 @@ struct scu_widget | |||
| 152 | // // | 152 | // // |
| 153 | ////////////////// | 153 | ////////////////// |
| 154 | #ifdef __SECURECOREUTILS_PMARK | 154 | #ifdef __SECURECOREUTILS_PMARK |
| 155 | #pragma mark - | 155 | #pragma mark - Prototypes |
| 156 | #endif | 156 | #endif |
| 157 | 157 | ||
| 158 | /// checks paths | 158 | /// checks paths |
diff --git a/src/widget-cat.h b/src/widget-cat.h index 67bbd8c..2f67114 100644 --- a/src/widget-cat.h +++ b/src/widget-cat.h | |||
| @@ -56,8 +56,8 @@ | |||
| 56 | // Prototypes // | 56 | // Prototypes // |
| 57 | // // | 57 | // // |
| 58 | ////////////////// | 58 | ////////////////// |
| 59 | #ifdef __TALLYMARK_PMARK | 59 | #ifdef __SECURECOREUTILS_PMARK |
| 60 | #pragma mark - | 60 | #pragma mark - Prototypes |
| 61 | #endif | 61 | #endif |
| 62 | 62 | ||
| 63 | int scu_widget_cat(scu_config * cnf); | 63 | int scu_widget_cat(scu_config * cnf); |
diff --git a/src/widget-pathcheck.h b/src/widget-pathcheck.h index e3b0ec3..986919d 100644 --- a/src/widget-pathcheck.h +++ b/src/widget-pathcheck.h | |||
| @@ -56,8 +56,8 @@ | |||
| 56 | // Prototypes // | 56 | // Prototypes // |
| 57 | // // | 57 | // // |
| 58 | ////////////////// | 58 | ////////////////// |
| 59 | #ifdef __TALLYMARK_PMARK | 59 | #ifdef __SECURECOREUTILS_PMARK |
| 60 | #pragma mark - | 60 | #pragma mark - Prototypes |
| 61 | #endif | 61 | #endif |
| 62 | 62 | ||
| 63 | int scu_widget_pathcheck(scu_config * cnf); | 63 | int scu_widget_pathcheck(scu_config * cnf); |
diff --git a/src/widget-rm.h b/src/widget-rm.h index e96a22c..82d78b7 100644 --- a/src/widget-rm.h +++ b/src/widget-rm.h | |||
| @@ -56,8 +56,8 @@ | |||
| 56 | // Prototypes // | 56 | // Prototypes // |
| 57 | // // | 57 | // // |
| 58 | ////////////////// | 58 | ////////////////// |
| 59 | #ifdef __TALLYMARK_PMARK | 59 | #ifdef __SECURECOREUTILS_PMARK |
| 60 | #pragma mark - | 60 | #pragma mark - Prototypes |
| 61 | #endif | 61 | #endif |
| 62 | 62 | ||
| 63 | int scu_widget_rm(scu_config * cnf); | 63 | int scu_widget_rm(scu_config * cnf); |
diff --git a/src/widget-rmdir.h b/src/widget-rmdir.h index 956ffbb..6f23f5f 100644 --- a/src/widget-rmdir.h +++ b/src/widget-rmdir.h | |||
| @@ -56,8 +56,8 @@ | |||
| 56 | // Prototypes // | 56 | // Prototypes // |
| 57 | // // | 57 | // // |
| 58 | ////////////////// | 58 | ////////////////// |
| 59 | #ifdef __TALLYMARK_PMARK | 59 | #ifdef __SECURECOREUTILS_PMARK |
| 60 | #pragma mark - | 60 | #pragma mark - Prototypes |
| 61 | #endif | 61 | #endif |
| 62 | 62 | ||
| 63 | int scu_widget_rmdir(scu_config * cnf); | 63 | int scu_widget_rmdir(scu_config * cnf); |
diff --git a/src/widget-tail.c b/src/widget-tail.c index 70ca504..2b1631a 100644 --- a/src/widget-tail.c +++ b/src/widget-tail.c | |||
| @@ -62,6 +62,9 @@ | |||
| 62 | // Definitions // | 62 | // Definitions // |
| 63 | // // | 63 | // // |
| 64 | /////////////////// | 64 | /////////////////// |
| 65 | #ifdef __SECURECOREUTILS_PMARK | ||
| 66 | #pragma mark - Definitions | ||
| 67 | #endif | ||
| 65 | 68 | ||
| 66 | #define SCU_TAIL_OBOL 0x01 | 69 | #define SCU_TAIL_OBOL 0x01 |
| 67 | #define SCU_TAIL_OBYTES 0x02 | 70 | #define SCU_TAIL_OBYTES 0x02 |
| @@ -73,6 +76,9 @@ | |||
| 73 | // Prototypes // | 76 | // Prototypes // |
| 74 | // // | 77 | // // |
| 75 | ////////////////// | 78 | ////////////////// |
| 79 | #ifdef __SECURECOREUTILS_PMARK | ||
| 80 | #pragma mark - Prototypes | ||
| 81 | #endif | ||
| 76 | 82 | ||
| 77 | int scu_widget_tail_bytes(scu_config * cnf, int fd, struct stat * sb, | 83 | int scu_widget_tail_bytes(scu_config * cnf, int fd, struct stat * sb, |
| 78 | size_t opts, off_t optnum); | 84 | size_t opts, off_t optnum); |
| @@ -81,11 +87,14 @@ int scu_widget_tail_lines(scu_config * cnf, int fd, struct stat * sb, | |||
| 81 | size_t opts, off_t optnum); | 87 | size_t opts, off_t optnum); |
| 82 | 88 | ||
| 83 | 89 | ||
| 84 | //////////////// | 90 | ///////////////// |
| 85 | // // | 91 | // // |
| 86 | // Variable // | 92 | // Variables // |
| 87 | // // | 93 | // // |
| 88 | //////////////// | 94 | ///////////////// |
| 95 | #ifdef __SECURECOREUTILS_PMARK | ||
| 96 | #pragma mark - Variables | ||
| 97 | #endif | ||
| 89 | 98 | ||
| 90 | static int timeout_alarmed = 0; | 99 | static int timeout_alarmed = 0; |
| 91 | 100 | ||
diff --git a/src/widget-tail.h b/src/widget-tail.h index 4b5263b..b0de990 100644 --- a/src/widget-tail.h +++ b/src/widget-tail.h | |||
| @@ -56,8 +56,8 @@ | |||
| 56 | // Prototypes // | 56 | // Prototypes // |
| 57 | // // | 57 | // // |
| 58 | ////////////////// | 58 | ////////////////// |
| 59 | #ifdef __TALLYMARK_PMARK | 59 | #ifdef __SECURECOREUTILS_PMARK |
| 60 | #pragma mark - | 60 | #pragma mark - Prototypes |
| 61 | #endif | 61 | #endif |
| 62 | 62 | ||
| 63 | int scu_widget_tail(scu_config * cnf); | 63 | int scu_widget_tail(scu_config * cnf); |
diff --git a/src/widget-zcat.c b/src/widget-zcat.c index 1fc4a2e..7b58ebc 100644 --- a/src/widget-zcat.c +++ b/src/widget-zcat.c | |||
| @@ -75,6 +75,9 @@ | |||
| 75 | // Variables // | 75 | // Variables // |
| 76 | // // | 76 | // // |
| 77 | ///////////////// | 77 | ///////////////// |
| 78 | #ifdef __SECURECOREUTILS_PMARK | ||
| 79 | #pragma mark - Variables | ||
| 80 | #endif | ||
| 78 | 81 | ||
| 79 | const uint8_t scm_magic_bz2[3] = { 0x42, 0x5a, 0x68 }; // tar.bz2 | 82 | const uint8_t scm_magic_bz2[3] = { 0x42, 0x5a, 0x68 }; // tar.bz2 |
| 80 | const uint8_t scm_magic_gz[2] = { 0x1f, 0x8b }; // tar.gz | 83 | const uint8_t scm_magic_gz[2] = { 0x1f, 0x8b }; // tar.gz |
| @@ -89,8 +92,8 @@ const uint8_t scm_magic_lzma[6] = { 0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00 }; // ta | |||
| 89 | // Prototypes // | 92 | // Prototypes // |
| 90 | // // | 93 | // // |
| 91 | ////////////////// | 94 | ////////////////// |
| 92 | #ifdef __TALLYMARK_PMARK | 95 | #ifdef __SECURECOREUTILS_PMARK |
| 93 | #pragma mark - | 96 | #pragma mark - Prototypes |
| 94 | #endif | 97 | #endif |
| 95 | 98 | ||
| 96 | #ifdef USE_LZMA | 99 | #ifdef USE_LZMA |
diff --git a/src/widget-zcat.h b/src/widget-zcat.h index f2c1996..d51d4cd 100644 --- a/src/widget-zcat.h +++ b/src/widget-zcat.h | |||
| @@ -56,8 +56,8 @@ | |||
| 56 | // Prototypes // | 56 | // Prototypes // |
| 57 | // // | 57 | // // |
| 58 | ////////////////// | 58 | ////////////////// |
| 59 | #ifdef __TALLYMARK_PMARK | 59 | #ifdef __SECURECOREUTILS_PMARK |
| 60 | #pragma mark - | 60 | #pragma mark - Prototypes |
| 61 | #endif | 61 | #endif |
| 62 | 62 | ||
| 63 | int scu_widget_zcat(scu_config * cnf); | 63 | int scu_widget_zcat(scu_config * cnf); |
