Replace header guards with the universally supported pragma once

This commit is contained in:
Mike Sharov 2018-04-27 11:05:49 -04:00
parent cea1dafb04
commit c75ddea2ce
21 changed files with 21 additions and 82 deletions

View File

@ -14,9 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef ABOUT_H
#define ABOUT_H
#pragma once
void UIAbout (void);
#endif

View File

@ -14,8 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef CATEGORIES_H
#define CATEGORIES_H
#pragma once
void FeedCategoryAdd (struct feed * cur_ptr, char * categoryname);
void FeedCategoryDelete (struct feed * cur_ptr, char * categoryname);
@ -37,5 +36,3 @@ struct categories {
int labelbold;
struct categories * next_ptr;
};
#endif

View File

@ -14,8 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef CONFIG_H
#define CONFIG_H
#pragma once
// Define to the one symbol short name of this package
#define @PKG_UNAME@_NAME "@PKG_NAME@"
@ -148,5 +147,3 @@ extern struct feed *first_ptr;
#ifdef SUN
#include "os-support.h"
#endif
#endif

View File

@ -15,8 +15,7 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef CONVERSIONS_H
#define CONVERSIONS_H
#pragma once
#ifdef STATIC_CONST_ICONV
char * iconvert (const char * inbuf);
@ -36,5 +35,3 @@ char * unixToPostDateString (int unixDate);
#ifdef USE_UNSUPPORTED_AND_BROKEN_CODE
char* decodechunked(char * chunked, unsigned int *inputlen);
#endif
#endif

View File

@ -14,9 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef COOKIES_H
#define COOKIES_H
#pragma once
void LoadCookies (struct feed * cur_ptr);
#endif

View File

@ -14,8 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef DIALOG_H
#define DIALOG_H
#pragma once
void UIHelpScreen (void);
void UIDisplayFeedHelp (void);
@ -30,5 +29,3 @@ int UIDeleteFeed (char * feedname);
void CategorizeFeed (struct feed * current_feed);
char * DialogGetCategoryFilter (void);
int UIPerFeedFilter (struct feed * current_feed);
#endif

View File

@ -18,8 +18,7 @@
// The code has been modified to work with Colin Plumb's
// MD5 implementation rather than using RSA's.
#ifndef DIGCALC_H
#define DIGCALC_H
#pragma once
#define HASHLEN 16
typedef char HASH[HASHLEN];
@ -43,5 +42,3 @@ void DigestCalcResponse (
const HASHHEX HEntity, // H(entity body) if qop="auth-int"
HASHHEX Response // request-digest or response-digest
);
#endif

View File

@ -14,11 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef FILTERS_H
#define FILTERS_H
#pragma once
int FilterExecURL (struct feed * cur_ptr);
//int FilterPipe (struct feed * cur_ptr);
int FilterPipeNG (struct feed * cur_ptr);
#endif

View File

@ -14,10 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef INTERFACE_H
#define INTERFACE_H
#pragma once
void sig_winch(int p);
void UIMainInterface (void);
#endif

View File

@ -14,8 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef IO_INTERNAL_H
#define IO_INTERNAL_H
#pragma once
struct feed * newFeedStruct (void);
int UpdateFeed (struct feed * cur_ptr);
@ -25,5 +24,3 @@ int LoadAllFeeds (int numfeeds);
void WriteCache (void);
void printlog (struct feed * feed, const char * text);
void printlogSimple (const char * text);
#endif

6
main.h
View File

@ -14,11 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef MAIN_H
#define MAIN_H
#pragma once
#include "config.h"
void MainQuit(const char * func, const char * error);
#endif

View File

@ -14,11 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef NET_SUPPORT_H
#define NET_SUPPORT_H
#pragma once
int NetSupportAuth (struct feed * cur_ptr, const char * authdata, char * url, const char * netbuf);
int checkValidHTTPHeader (const unsigned char * header, int size);
int checkValidHTTPURL (const unsigned char * url);
#endif

View File

@ -14,8 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef NETIO_H
#define NETIO_H
#pragma once
struct feed;
@ -46,5 +45,3 @@ typedef enum {
NET_ERR_GZIP_ERR,
NET_ERR_CHUNKED
} netio_error_type;
#endif

View File

@ -14,8 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef OS_SUPPORT_H
#define OS_SUPPORT_H
#pragma once
#ifdef SUN
char* strsep (char** str, const char* delims);
@ -23,5 +22,3 @@ char* strsep (char** str, const char* delims);
const char* s_strcasestr (const char* a, const char* b);
void* s_malloc (size_t size);
#endif

View File

@ -14,8 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef SETUP_H
#define SETUP_H
#pragma once
int Config (void);
@ -25,5 +24,3 @@ struct entity {
int entity_length;
struct entity * next_ptr;
};
#endif

View File

@ -14,9 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef SUPPORT_H
#define SUPPORT_H
#pragma once
int easterEgg (void);
#endif

View File

@ -14,8 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef UI_SUPPORT_H
#define UI_SUPPORT_H
#pragma once
typedef enum {
NORMAL,
@ -35,5 +34,3 @@ int SmartFeedExists (const char * smartfeed);
void DrawProgressBar (int numobjects, int titlestrlen);
void displayErrorLog (void);
void clearLine (int line, clear_line how);
#endif

View File

@ -14,9 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef UPDATECHECK_H
#define UPDATECHECK_H
#pragma once
void AutoVersionCheck (void);
#endif

View File

@ -14,4 +14,5 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#pragma once
#define VERSION "1.5.13"

View File

@ -14,9 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef XMLPARSE_H
#define XMLPARSE_H
#pragma once
#include <libxml/parser.h>
void parse_rdf10_item(struct feed *feed, xmlDocPtr doc, xmlNodePtr node);
@ -24,5 +22,3 @@ void parse_rdf10_channel(struct feed * feed, xmlDocPtr doc, xmlNodePtr node);
void parse_rdf20_channel(struct feed * feed, xmlDocPtr doc, xmlNodePtr node);
int DeXML (struct feed * cur_ptr);
void print_feed(struct feed * feed);
#endif

View File

@ -14,8 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Snownews. If not, see http://www.gnu.org/licenses/.
#ifndef JG_ZLIB_INTERFACE
#define JG_ZLIB_INTERFACE
#pragma once
enum JG_ZLIB_ERROR {
JG_ZLIB_ERROR_OLDVERSION = -1,
@ -32,5 +31,3 @@ int jg_zlib_uncompress(void const *in_buf, int in_size,
int jg_gzip_uncompress(void const *in_buf, int in_size,
void **out_buf_ptr, int *out_size);
#endif