From 7248da418913651d473e405f316c7ac6b886750c Mon Sep 17 00:00:00 2001 From: "David M. Syzdek" Date: Fri, 7 Jul 2017 19:57:27 -0800 Subject: Cleaning up pragmas. --- src/securecoreutils.c | 2 +- src/securecoreutils.h | 2 +- src/widget-cat.h | 4 ++-- src/widget-pathcheck.h | 4 ++-- src/widget-rm.h | 4 ++-- src/widget-rmdir.h | 4 ++-- src/widget-tail.c | 19 ++++++++++++++----- src/widget-tail.h | 4 ++-- src/widget-zcat.c | 7 +++++-- 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); // Variables // // // ///////////////// -#ifdef __TALLYMARK_PMARK +#ifdef __SECURECOREUTILS_PMARK #pragma mark - Variables #endif 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 // // ////////////////// #ifdef __SECURECOREUTILS_PMARK -#pragma mark - +#pragma mark - Prototypes #endif /// 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 @@ // Prototypes // // // ////////////////// -#ifdef __TALLYMARK_PMARK -#pragma mark - +#ifdef __SECURECOREUTILS_PMARK +#pragma mark - Prototypes #endif 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 @@ // Prototypes // // // ////////////////// -#ifdef __TALLYMARK_PMARK -#pragma mark - +#ifdef __SECURECOREUTILS_PMARK +#pragma mark - Prototypes #endif 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 @@ // Prototypes // // // ////////////////// -#ifdef __TALLYMARK_PMARK -#pragma mark - +#ifdef __SECURECOREUTILS_PMARK +#pragma mark - Prototypes #endif 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 @@ // Prototypes // // // ////////////////// -#ifdef __TALLYMARK_PMARK -#pragma mark - +#ifdef __SECURECOREUTILS_PMARK +#pragma mark - Prototypes #endif 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 @@ // Definitions // // // /////////////////// +#ifdef __SECURECOREUTILS_PMARK +#pragma mark - Definitions +#endif #define SCU_TAIL_OBOL 0x01 #define SCU_TAIL_OBYTES 0x02 @@ -73,6 +76,9 @@ // Prototypes // // // ////////////////// +#ifdef __SECURECOREUTILS_PMARK +#pragma mark - Prototypes +#endif int scu_widget_tail_bytes(scu_config * cnf, int fd, struct stat * sb, size_t opts, off_t optnum); @@ -81,11 +87,14 @@ int scu_widget_tail_lines(scu_config * cnf, int fd, struct stat * sb, size_t opts, off_t optnum); -//////////////// -// // -// Variable // -// // -//////////////// +///////////////// +// // +// Variables // +// // +///////////////// +#ifdef __SECURECOREUTILS_PMARK +#pragma mark - Variables +#endif static int timeout_alarmed = 0; 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 @@ // Prototypes // // // ////////////////// -#ifdef __TALLYMARK_PMARK -#pragma mark - +#ifdef __SECURECOREUTILS_PMARK +#pragma mark - Prototypes #endif 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 @@ // Variables // // // ///////////////// +#ifdef __SECURECOREUTILS_PMARK +#pragma mark - Variables +#endif const uint8_t scm_magic_bz2[3] = { 0x42, 0x5a, 0x68 }; // tar.bz2 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 // Prototypes // // // ////////////////// -#ifdef __TALLYMARK_PMARK -#pragma mark - +#ifdef __SECURECOREUTILS_PMARK +#pragma mark - Prototypes #endif #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 @@ // Prototypes // // // ////////////////// -#ifdef __TALLYMARK_PMARK -#pragma mark - +#ifdef __SECURECOREUTILS_PMARK +#pragma mark - Prototypes #endif int scu_widget_zcat(scu_config * cnf); -- cgit v1.2.3