[or-cvs] r8388: r8808 at senior-two-eighty: nickm | 2006-09-14 00:59:54 -0400 H (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2006-09-14 01:00:02 -0400 (Thu, 14 Sep 2006)
New Revision: 8388

Modified:
   tor/trunk/
   tor/trunk/src/or/dirserv.c
   tor/trunk/src/or/or.h
Log:
 r8808 at senior-two-eighty:  nickm | 2006-09-14 00:59:54 -0400
 House style for no-args functions is old-style C, not C++



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r8808] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2006-09-14 04:53:42 UTC (rev 8387)
+++ tor/trunk/src/or/dirserv.c	2006-09-14 05:00:02 UTC (rev 8388)
@@ -129,7 +129,7 @@
  * failure, leave the current fingerprint list untouched, and
  * return -1. */
 int
-dirserv_load_fingerprint_file()
+dirserv_load_fingerprint_file(void)
 {
   char fname[512];
   char *cf;

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2006-09-14 04:53:42 UTC (rev 8387)
+++ tor/trunk/src/or/or.h	2006-09-14 05:00:02 UTC (rev 8388)
@@ -2095,7 +2095,7 @@
 
 int connection_dirserv_flushed_some(dir_connection_t *conn);
 int dirserv_add_own_fingerprint(const char *nickname, crypto_pk_env_t *pk);
-int dirserv_load_fingerprint_file();
+int dirserv_load_fingerprint_file(void);
 void dirserv_free_fingerprint_list(void);
 const char *dirserv_get_nickname_by_digest(const char *digest);
 int dirserv_add_descriptor(const char *desc, const char **msg);