Commit 93959995 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

checksrc: use space after comma

parent a6b8fe2a

lib/amigaos.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2015, 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

lib/checksrc.pl

+32 −0
Original line number Diff line number Diff line
@@ -155,6 +155,38 @@ sub scanfile { 
            }

        }



        # check for comma without space

        if($l =~ /^(.*),[^ \n]/) {

            my $pref=$1;

            my $ign=0;

            if($pref =~ / *\#/) {

                # this is a #if, treat it differently

                $ign=1;

            }

            elsif($pref =~ /\/\*/) {

                # this is a comment

                $ign=1;

            }

            elsif($pref =~ /[\"\']/) {

                $ign = 1;

                # There is a quote here, figure out whether the comma is

                # within a string or '' or not.

                if($pref =~ /\"/) {

                    # withing a string

                }

                elsif($pref =~ /\'$/) {

                    # a single letter

                }

                else {

                    $ign = 0;

                }

            }

            if(!$ign) {

                checkwarn($line, length($pref)+1, $file, $l,

                          "comma without following space");

            }

        }

        

        # check for "} else"

        if($l =~ /^(.*)\} *else/) {

            checkwarn($line, length($1), $file, $l, "else after closing brace on same line");

lib/inet_ntop.h

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2015, 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

lib/krb5.c

+4 −2
Original line number Diff line number Diff line
@@ -246,7 +246,8 @@ krb5_auth(void *app_data, struct connectdata *conn) 
        result = Curl_base64_encode(data, (char *)output_buffer.value,

                                    output_buffer.length, &p, &base64_sz);

        if(result) {

          Curl_infof(data,"base64-encoding: %s\n", curl_easy_strerror(result));

          Curl_infof(data, "base64-encoding: %s\n",

                     curl_easy_strerror(result));

          ret = AUTH_CONTINUE;

          break;

        }
@@ -278,7 +279,8 @@ krb5_auth(void *app_data, struct connectdata *conn) 
                                      (unsigned char **)&_gssresp.value,

                                      &_gssresp.length);

          if(result) {

            Curl_failf(data,"base64-decoding: %s", curl_easy_strerror(result));

            Curl_failf(data, "base64-decoding: %s",

                       curl_easy_strerror(result));

            ret = AUTH_CONTINUE;

            break;

          }

lib/memdebug.h

+8 −8
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ CURL_EXTERN int curl_fclose(FILE *file, int line, const char *source); 
#ifdef HAVE_GETNAMEINFO

#undef getnameinfo

#define getnameinfo(sa,salen,host,hostlen,serv,servlen,flags) \

  curl_dogetnameinfo(sa,salen,host,hostlen,serv,servlen,flags, __LINE__, \

  __FILE__)

  curl_dogetnameinfo(sa, salen, host, hostlen, serv, servlen, flags, \

                     __LINE__, __FILE__)

#endif /* HAVE_GETNAMEINFO */



#ifdef HAVE_FREEADDRINFO