Mohun Biswas pointed out that --libcurl generated a source code with an int

function but without a return statement. While fixing that, I also took care
about adding some better comments for the generated code.

3 files changed, 12 insertions, 3 deletions

diff --git a/CHANGES b/CHANGES
index 37dd29a01..be257d473 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
                                   Changelog
 
+Daniel S (1 Jan 2008)
+- Mohun Biswas pointed out that --libcurl generated a source code with an int
+  function but without a return statement. While fixing that, I also took care
+  about adding some better comments for the generated code.
+
 Daniel S (27 Dec 2007)
 - Dmitry Kurochkin mentioned a flaw
   (http://curl.haxx.se/mail/lib-2007-12/0252.html) in detect_proxy() which
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c01740d94..9e7219287 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -40,6 +40,7 @@ This release includes the following bugfixes:
  o Windows curl builds failed file truncation when retry downloading
  o SSL session ID cache memory leak
  o bad connection re-use check with environment variable-activated proxy use
+ o --libcurl now generates a return statement as well
 
 This release includes the following known bugs:
 
@@ -61,6 +62,6 @@ advice from friends like these:
  Robin Johnson, Michal Marek, Ates Goral, Andres Garcia, Rob Crittenden,
  Emil Romanus, Alessandro Vesely, Ray Pekowski, Spacen Jasset, Andrew Moise,
  Gilles Blanc, David Wright, Vikram Saxena, Mateusz Loskot, Gary Maxwell,
- Dmitry Kurochkin
+ Dmitry Kurochkin, Mohun Biswas
  
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/src/main.c b/src/main.c
index b7a02b3ab..5d83b6b43 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2008, 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
@@ -3575,6 +3575,8 @@ static const char * const srchead[]={
   " * libcurl.",
   " * If you use any *_LARGE options, make sure your compiler figure",
   " * out the correct size for the curl_off_t variable.",
+  " * Read the details for all curl_easy_setopt() options online on:",
+  " * http://curlm.haxx.se/libcurl/c/curl_easy_setopt.html",
   " ************************************************************************/",
   "[m]",
   "#include <curl/curl.h>",
@@ -3622,8 +3624,9 @@ static void dumpeasycode(struct Configurable *config)
         ptr = ptr->next;
       }
       fprintf(out,
+              "  return (int)ret;\n"
               "}\n"
-              "/* */\n");
+              "/**** End of sample code ****/\n");
       if(fopened)
         fclose(out);
     }