aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.inc2
-rw-r--r--src/Makefile.riscos2
-rw-r--r--src/getpass.c6
-rw-r--r--src/homedir.h18
-rw-r--r--src/hugehelp.h19
-rw-r--r--src/mkhelp.pl2
-rw-r--r--src/setup.h14
-rw-r--r--src/version.h18
-rw-r--r--src/writeenv.h18
-rw-r--r--src/writeout.h18
11 files changed, 60 insertions, 59 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9db5fd79a..baa9666dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,7 +43,7 @@ target_link_libraries( ${EXE_NAME} libcurl )
#SET_TARGET_PROPERTIES(${EXE_NAME} LIBRARY_OUTPUT_DIRECTORY "blah blah blah")
# Add the postfix to the executable since it is not added automatically as for modules and shared libraries
-set_target_properties(${EXE_NAME} PROPERTIES
+set_target_properties(${EXE_NAME} PROPERTIES
DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
if(MSVC)
diff --git a/src/Makefile.inc b/src/Makefile.inc
index 8ea5dae4d..9faf89d3d 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -1,5 +1,5 @@
# ./src/Makefile.inc
-
+
# libcurl has sources that provide functions named curlx_* that aren't part of
# the official API, but we re-use the code here to avoid duplication.
CURLX_ONES = $(top_srcdir)/lib/strtoofft.c \
diff --git a/src/Makefile.riscos b/src/Makefile.riscos
index d0e13d212..35a194ff4 100644
--- a/src/Makefile.riscos
+++ b/src/Makefile.riscos
@@ -9,7 +9,7 @@ objs = o.hugehelp o.main o.urlglob o.writeout o.writeenv o.rawstr o.nonblock
# Compile options:
linkopts = ../lib/libcurl openldap:libraries/libldap/libldap -o curl
-compileropts = -mpoke-function-name -IUtilLib: -mthrowback
+compileropts = -mpoke-function-name -IUtilLib: -mthrowback
# Project target:
curl: $(objs)
diff --git a/src/getpass.c b/src/getpass.c
index a46d8e30d..ce3ab5e0f 100644
--- a/src/getpass.c
+++ b/src/getpass.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -124,7 +124,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen)
previous one as well */
i = i - (i>=1?2:1);
}
-#ifndef __SYMBIAN32__
+#ifndef __SYMBIAN32__
/* since echo is disabled, print a newline */
fputs("\n", stderr);
#endif
@@ -157,7 +157,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen)
if (buffer[i-1] == '\b') {
/* remove this letter and if this is not the first key,
remove the previous one as well */
- if (i > 1) {
+ if (i > 1) {
printf("\b \b");
i = i - 2;
} else {
diff --git a/src/homedir.h b/src/homedir.h
index 4daa84e10..84420eeae 100644
--- a/src/homedir.h
+++ b/src/homedir.h
@@ -1,18 +1,18 @@
-#ifndef __HOMEDIR_H
-#define __HOMEDIR_H
+#ifndef HEADER_CURL_HOMEDIR_H
+#define HEADER_CURL_HOMEDIR_H
/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://curl.haxx.se/docs/copyright.html.
- *
+ *
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
@@ -25,4 +25,4 @@
char *homedir(void);
-#endif
+#endif /* HEADER_CURL_HOMEDIR_H */
diff --git a/src/hugehelp.h b/src/hugehelp.h
index 81994b784..a6c66ded6 100644
--- a/src/hugehelp.h
+++ b/src/hugehelp.h
@@ -1,18 +1,18 @@
-#ifndef __HUGEHELP_H
-#define __HUGEHELP_H
+#ifndef HEADER_CURL_HUGEHELP_H
+#define HEADER_CURL_HUGEHELP_H
/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://curl.haxx.se/docs/copyright.html.
- *
+ *
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
@@ -23,4 +23,5 @@
* $Id$
***************************************************************************/
void hugehelp(void);
-#endif
+
+#endif /* HEADER_CURL_HUGEHELP_H */
diff --git a/src/mkhelp.pl b/src/mkhelp.pl
index 7fb37db58..c84ab4ae7 100644
--- a/src/mkhelp.pl
+++ b/src/mkhelp.pl
@@ -87,7 +87,7 @@ if($c) {
close(GZIP);
system("gzip --best --no-name dumpit");
-
+
open(GZIP, "<dumpit.gz") ||
die "can't read the dumpit.gz file, try without -c";
binmode GZIP;
diff --git a/src/setup.h b/src/setup.h
index 36fde516f..16112f50d 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -1,5 +1,5 @@
-#ifndef __SRC_CURL_SETUP_H
-#define __SRC_CURL_SETUP_H
+#ifndef HEADER_CURL_SRC_SETUP_H
+#define HEADER_CURL_SRC_SETUP_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -91,10 +91,10 @@
# endif
#endif
-/*
+/*
* Include header files for windows builds before redefining anything.
- * Use this preproessor block only to include or exclude windows.h,
- * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
+ * Use this preproessor block only to include or exclude windows.h,
+ * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
* to any other further and independent block. Under Cygwin things work
* just as under linux (e.g. <sys/socket.h>) and the winsock headers should
* never be included when __CYGWIN__ is defined. configure script takes
@@ -216,4 +216,4 @@ int fileno( FILE *stream);
#include "setup_once.h"
#endif
-#endif /* __SRC_CURL_SETUP_H */
+#endif /* HEADER_CURL_SRC_SETUP_H */
diff --git a/src/version.h b/src/version.h
index 316dc80b9..75866fac4 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,18 +1,18 @@
-#ifndef __VERSION_H
-#define __VERSION_H
+#ifndef HEADER_CURL_VERSION_H
+#define HEADER_CURL_VERSION_H
/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://curl.haxx.se/docs/copyright.html.
- *
+ *
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
@@ -33,4 +33,4 @@
#define CURL_VERSION_PATCH LIBCURL_VERSION_PATCH
#define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "
-#endif
+#endif /* HEADER_CURL_VERSION_H */
diff --git a/src/writeenv.h b/src/writeenv.h
index 0ad94c45b..8343deff0 100644
--- a/src/writeenv.h
+++ b/src/writeenv.h
@@ -1,18 +1,18 @@
-#ifndef __WRITEENV_H
-#define __WRITEENV_H
+#ifndef HEADER_CURL_WRITEENV_H
+#define HEADER_CURL_WRITEENV_H
/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://curl.haxx.se/docs/copyright.html.
- *
+ *
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
@@ -25,4 +25,4 @@
void ourWriteEnv(CURL *curl);
-#endif
+#endif /* HEADER_CURL_WRITEENV_H */
diff --git a/src/writeout.h b/src/writeout.h
index 222e27029..c5b7ee6ee 100644
--- a/src/writeout.h
+++ b/src/writeout.h
@@ -1,18 +1,18 @@
-#ifndef __WRITEOUT_H
-#define __WRITEOUT_H
+#ifndef HEADER_CURL_WRITEOUT_H
+#define HEADER_CURL_WRITEOUT_H
/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://curl.haxx.se/docs/copyright.html.
- *
+ *
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
@@ -25,4 +25,4 @@
void ourWriteOut(CURL *curl, const char *out);
-#endif
+#endif /* HEADER_CURL_WRITEOUT_H */