Commit 33ce0ec1 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

wrap long lines and do some indent policing

parent 14358640

lib/connect.c

+7 −6
Original line number Diff line number Diff line
@@ -734,12 +734,13 @@ singleipconnect(struct connectdata *conn, 


  if(data->set.fopensocket)

   /*

    * If the opensocket callback is set, all the destination address information

    * is passed to the callback. Depending on this information the callback may

    * opt to abort the connection, this is indicated returning CURL_SOCKET_BAD;

    * otherwise it will return a not-connected socket. When the callback returns

    * a valid socket the destination address information might have been changed

    * and this 'new' address will actually be used here to connect.

    * If the opensocket callback is set, all the destination address

    * information is passed to the callback. Depending on this information the

    * callback may opt to abort the connection, this is indicated returning

    * CURL_SOCKET_BAD; otherwise it will return a not-connected socket. When

    * the callback returns a valid socket the destination address information

    * might have been changed and this 'new' address will actually be used

    * here to connect.

    */

    sockfd = data->set.fopensocket(data->set.opensocket_client,

                                   CURLSOCKTYPE_IPCXN,

lib/content_encoding.c

+18 −18
Original line number Diff line number Diff line
@@ -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
@@ -285,8 +285,8 @@ Curl_unencode_gzip_write(struct connectdata *conn, 
        return process_zlib_error(conn, z);

      }

      k->zlib_init = ZLIB_INIT_GZIP; /* Transparent gzip decompress state */



    } else {

    }

    else {

      /* we must parse the gzip header ourselves */

      if(inflateInit2(z, -MAX_WBITS) != Z_OK) {

        return process_zlib_error(conn, z);

lib/easy.c

+5 −3
Original line number Diff line number Diff line
@@ -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
@@ -886,7 +886,8 @@ CURLcode Curl_convert_to_network(struct SessionHandle *data, 
            rc, curl_easy_strerror(rc));

    }

    return(rc);

  } else {

  }

  else {

#ifdef HAVE_ICONV

    /* do the translation ourselves */

    char *input_ptr, *output_ptr;
@@ -1007,7 +1008,8 @@ CURLcode Curl_convert_from_utf8(struct SessionHandle *data, 
            rc, curl_easy_strerror(rc));

    }

    return(rc);

  } else {

  }

  else {

#ifdef HAVE_ICONV

    /* do the translation ourselves */

    const char *input_ptr;

lib/escape.c

+3 −2
Original line number Diff line number Diff line
@@ -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
@@ -103,7 +103,8 @@ char *curl_easy_escape(CURL *handle, const char *string, int inlength) 
    if (Curl_isalnum(in)) {

      /* just copy this */

      ns[strindex++]=in;

    } else {

    }

    else {

      /* encode it */

      newlen += 2; /* the size grows with two, since this'll become a %XX */

      if(newlen > alloc) {

lib/formdata.c

+3 −2
Original line number Diff line number Diff line
@@ -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
@@ -998,7 +998,8 @@ int curl_formget(struct curl_httppost *form, void *arg, 
          return -1;

        }

      } while(nread == sizeof(buffer));

    } else {

    }

    else {

      if(ptr->length != append(arg, ptr->line, ptr->length)) {

        Curl_formclean(&data);

        return -1;