Change end-of-file NLNL convention. It turns out arma I and I agree.

svn:r4382

49 files changed, 49 insertions, 1 deletions

diff --git a/contrib/checkSpace.pl b/contrib/checkSpace.pl
index 8b6fb828b..3b6c6f54d 100755
--- a/contrib/checkSpace.pl
+++ b/contrib/checkSpace.pl
@@ -75,7 +75,7 @@ for $fn (@ARGV) {
 	    }
 	}
     }
-    if ($lastnil) {
+    if (! $lastnil) {
         print "  EOL\@EOF:$fn:$.\n";
     }
     close(F);
diff --git a/src/common/aes.c b/src/common/aes.c
index 455563c8c..1f7195cbc 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -812,3 +812,4 @@ void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16], u8 c
                 rk[3];
         PUTU32(ct + 12, s3);
 }
+
diff --git a/src/common/aes.h b/src/common/aes.h
index 693880a7c..44e8b0091 100644
--- a/src/common/aes.h
+++ b/src/common/aes.h
@@ -28,3 +28,4 @@ void aes_set_counter(aes_cnt_cipher_t *cipher, uint64_t counter);
 void aes_adjust_counter(aes_cnt_cipher_t *cipher, long delta);
 
 #endif
+
diff --git a/src/common/compat.c b/src/common/compat.c
index 8bdecfc7f..4c46906a0 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -1031,3 +1031,4 @@ int network_init(void)
 #endif
   return 0;
 }
+
diff --git a/src/common/compat.h b/src/common/compat.h
index 5dd5104e2..8f44e9385 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -239,3 +239,4 @@ unsigned long tor_get_thread_id(void);
 #endif
 
 #endif
+
diff --git a/src/common/container.c b/src/common/container.c
index 408b49f3d..f892cd677 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -649,3 +649,4 @@ int strmap_isempty(strmap_t *map)
 {
   return SPLAY_EMPTY(&map->head);
 }
+
diff --git a/src/common/container.h b/src/common/container.h
index 60a13c596..0b64a05e4 100644
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -94,3 +94,4 @@ void strmap_iter_get(strmap_iter_t *iter, const char **keyp, void **valp);
 int strmap_iter_done(strmap_iter_t *iter);
 
 #endif
+
diff --git a/src/common/crypto.c b/src/common/crypto.c
index ca50d877a..d05d01269 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -1675,3 +1675,4 @@ setup_openssl_threading(void) {
 #else
 static int setup_openssl_threading(void) { return 0; }
 #endif
+
diff --git a/src/common/crypto.h b/src/common/crypto.h
index 8fe50f969..06245668c 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -160,3 +160,4 @@ void secret_to_key(char *key_out, size_t key_out_len, const char *secret,
                    size_t secret_len, const char *s2k_specifier);
 
 #endif
+
diff --git a/src/common/log.c b/src/common/log.c
index 6bcc75e3a..e254eb069 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -537,3 +537,4 @@ void suppress_libevent_log_msg(const char *msg)
 void configure_libevent_logging(void) {}
 void suppress_libevent_log_msg(const char *msg) {}
 #endif
+
diff --git a/src/common/log.h b/src/common/log.h
index d64559ce8..bfcb557e6 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -99,3 +99,4 @@ void _log_fn(int severity, const char *format, ...);
 
 # define __LOG_H
 #endif
+
diff --git a/src/common/test.h b/src/common/test.h
index 957437cdf..ec613b2c4 100644
--- a/src/common/test.h
+++ b/src/common/test.h
@@ -136,3 +136,4 @@ extern int have_failed;
   } STMT_END
 
 #endif
+
diff --git a/src/common/torgzip.c b/src/common/torgzip.c
index 2fdcd453f..b6753e8ac 100644
--- a/src/common/torgzip.c
+++ b/src/common/torgzip.c
@@ -245,3 +245,4 @@ int detect_compression_method(const char *in, size_t in_len)
     return 0;
   }
 }
+
diff --git a/src/common/torgzip.h b/src/common/torgzip.h
index a52cc0fb4..94aeceb5c 100644
--- a/src/common/torgzip.h
+++ b/src/common/torgzip.h
@@ -30,3 +30,4 @@ int is_gzip_supported(void);
 int detect_compression_method(const char *in, size_t in_len);
 
 #endif
+
diff --git a/src/common/torint.h b/src/common/torint.h
index cb6fff1a5..96464a29a 100644
--- a/src/common/torint.h
+++ b/src/common/torint.h
@@ -250,3 +250,4 @@ typedef uint32_t uintptr_t;
 #define SIZE_T_CEILING (sizeof(char)<<(sizeof(size_t)*8 - 1))
 
 #endif /* __TORINT_H */
+
diff --git a/src/common/tortls.c b/src/common/tortls.c
index e6e13a089..900965b1e 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -859,3 +859,4 @@ void _check_no_tls_errors(const char *fname, int line)
          fname, line);
   tls_log_errors(LOG_WARN, NULL);
 }
+
diff --git a/src/common/tortls.h b/src/common/tortls.h
index 1703b95b6..4d8aba264 100644
--- a/src/common/tortls.h
+++ b/src/common/tortls.h
@@ -51,3 +51,4 @@ unsigned long tor_tls_get_n_bytes_written(tor_tls *tls);
 void _check_no_tls_errors(const char *fname, int line);
 
 #endif
+
diff --git a/src/common/util.c b/src/common/util.c
index 943f912b4..a9441055d 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1443,3 +1443,4 @@ void write_pidfile(char *filename) {
   }
 #endif
 }
+
diff --git a/src/common/util.h b/src/common/util.h
index 31196085c..f6504abc7 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -142,3 +142,4 @@ void finish_daemon(const char *desired_cwd);
 void write_pidfile(char *filename);
 
 #endif
+
diff --git a/src/or/buffers.c b/src/or/buffers.c
index 310fd5772..f0943c2fa 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1093,3 +1093,4 @@ void assert_buf_ok(buf_t *buf)
   }
 #endif
 }
+
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index c41fb0f0c..d11ebd312 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1475,3 +1475,4 @@ onion_append_hop(crypt_path_t **head_ptr, routerinfo_t *choice) {
 
   return 0;
 }
+
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 18268fccc..cc1c0e517 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -707,3 +707,4 @@ void assert_circuit_ok(const circuit_t *c)
     tor_assert(!c->rend_splice);
   }
 }
+
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 4743afbce..defd0a25d 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1140,3 +1140,4 @@ int connection_ap_handshake_attach_circuit(connection_t *conn) {
     return 0;
   }
 }
+
diff --git a/src/or/command.c b/src/or/command.c
index eef5fc42c..62b27d661 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -335,3 +335,4 @@ static void command_process_destroy_cell(cell_t *cell, connection_t *conn) {
     }
   }
 }
+
diff --git a/src/or/config.c b/src/or/config.c
index 66aa624e6..d963a5c0d 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2785,3 +2785,4 @@ print_cvs_version(void)
   puts(routerlist_c_id);
   puts(routerparse_c_id);
 }
+
diff --git a/src/or/connection.c b/src/or/connection.c
index a87f27f8a..40979f2ce 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1817,3 +1817,4 @@ void assert_connection_ok(connection_t *conn, time_t now)
       tor_assert(0);
   }
 }
+
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 68c73bdff..c4a01f139 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1720,3 +1720,4 @@ failed:
     *s = '.';
     return BAD_HOSTNAME;
 }
+
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index b25a7805d..3d667f601 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -635,3 +635,4 @@ loop:
 
   goto loop; /* process the remainder of the buffer */
 }
+
diff --git a/src/or/control.c b/src/or/control.c
index 80ad6a33b..6ea4608c0 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1303,3 +1303,4 @@ init_cookie_authentication(int enabled)
 
   return 0;
 }
+
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index 940514139..2da8b9974 100644
--- a/src/or/cpuworker.c
+++ b/src/or/cpuworker.c
@@ -430,3 +430,4 @@ int assign_to_cpuworker(connection_t *cpuworker, uint8_t question_type,
   }
   return 0;
 }
+
diff --git a/src/or/directory.c b/src/or/directory.c
index f76f1f44a..32ed70ab0 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1190,3 +1190,4 @@ int connection_dir_finished_connecting(connection_t *conn)
   conn->state = DIR_CONN_STATE_CLIENT_SENDING; /* start flushing conn */
   return 0;
 }
+
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 94d18ae6d..c8599bf75 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1043,3 +1043,4 @@ dirserv_free_all(void)
   memset(&cached_directory, 0, sizeof(cached_directory));
   memset(&cached_runningrouters, 0, sizeof(cached_runningrouters));
 }
+
diff --git a/src/or/dns.c b/src/or/dns.c
index 643405a0c..d2bb01763 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -877,3 +877,4 @@ static void spawn_enough_dnsworkers(void) {
     num_dnsworkers--;
   }
 }
+
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 37418717f..1df81fdfd 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -832,3 +832,4 @@ void consider_hibernation(time_t now) {
     }
   }
 }
+
diff --git a/src/or/main.c b/src/or/main.c
index 775913a7c..c967a6938 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1624,3 +1624,4 @@ int tor_main(int argc, char *argv[]) {
   tor_cleanup();
   return -1;
 }
+
diff --git a/src/or/onion.c b/src/or/onion.c
index d51000198..75409c345 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -404,3 +404,4 @@ clear_pending_onions(void)
   ol_list = ol_tail = NULL;
   ol_length = 0;
 }
+
diff --git a/src/or/or.h b/src/or/or.h
index f55f83773..dbd4eef2e 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1887,3 +1887,4 @@ int tor_version_compare(tor_version_t *a, tor_version_t *b);
 void assert_addr_policy_ok(addr_policy_t *t);
 
 #endif
+
diff --git a/src/or/relay.c b/src/or/relay.c
index 701b47bb6..8732c658c 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1211,3 +1211,4 @@ circuit_consider_sending_sendme(circuit_t *circ, crypt_path_t *layer_hint)
     }
   }
 }
+
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index d5f2f0297..8f23ddfcb 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -447,3 +447,4 @@ char *rend_client_get_random_intro(char *query) {
   smartlist_free(sl);
   return nickname;
 }
+
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 50ad154d0..302066331 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -358,3 +358,4 @@ void rend_process_relay_cell(circuit_t *circ, int command, size_t length,
       tor_assert(0);
   }
 }
+
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index d56c9b1aa..fe6935a8f 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -289,3 +289,4 @@ rend_mid_rendezvous(circuit_t *circ, const char *request, size_t request_len)
   circuit_mark_for_close(circ);
   return -1;
 }
+
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 07728b3e5..9432440eb 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1028,3 +1028,4 @@ rend_service_set_connection_addr_port(connection_t *conn, circuit_t *circ)
          conn->port,serviceid);
   return -1;
 }
+
diff --git a/src/or/rephist.c b/src/or/rephist.c
index 7df81e612..ccdbe3932 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -758,3 +758,4 @@ void rep_hist_free_all(void)
   tor_free(write_array);
   predicted_ports_free();
 }
+
diff --git a/src/or/router.c b/src/or/router.c
index 1f67e5bd5..32f6e5af9 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -970,3 +970,4 @@ void router_free_all_keys(void)
   if (desc_routerinfo)
     routerinfo_free(desc_routerinfo);
 }
+
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 9b05d86f3..44aa8123b 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1459,3 +1459,4 @@ void clear_trusted_dir_servers(void)
     trusted_dir_servers = smartlist_create();
   }
 }
+
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 881c5009f..535c88d8d 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1631,3 +1631,4 @@ tor_version_same_series(tor_version_t *a, tor_version_t *b)
           (a->minor == b->minor) &&
           (a->micro == b->micro));
 }
+
diff --git a/src/or/test.c b/src/or/test.c
index c41cf9874..7d31b4e05 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -1463,3 +1463,4 @@ main(int c, char**v) {
   else
     return 0;
 }
+
diff --git a/src/or/tor_main.c b/src/or/tor_main.c
index 97de6fbdd..26c260c92 100644
--- a/src/or/tor_main.c
+++ b/src/or/tor_main.c
@@ -18,3 +18,4 @@ int main(int argc, char *argv[])
 {
   return tor_main(argc, argv);
 }
+
diff --git a/src/or/tree.h b/src/or/tree.h
index 7b4f6a0ee..6863bb7a4 100644
--- a/src/or/tree.h
+++ b/src/or/tree.h
@@ -675,3 +675,4 @@ name##_RB_MINMAX(struct name *head, int val)				\
 	     (x) = name##_RB_NEXT(head, x))
 
 #endif	/* _SYS_TREE_H_ */
+