branches/zip: Clean up some comments.

dict/dict0dict.c

@@ -4256,7 +4256,7 @@ UNIV_INTERN
 void
 dict_table_print_by_name(
 /*=====================*/
-	const char*	name)
+	const char*	name)	/* in: table name */
 {
 	dict_table_t*	table;
 

handler/ha_innodb.cc

@@ -380,7 +380,6 @@ static
 void
 innobase_drop_database(
 /*===================*/
-			/* out: error number */
 	handlerton* hton, /* in: handlerton of Innodb */
 	char*	path);	/* in: database path; inside InnoDB the name
 			of the last directory in the path is used as
@@ -2755,6 +2754,8 @@ Get the table flags to use for the statement. */
 UNIV_INTERN
 handler::Table_flags
 ha_innobase::table_flags() const
+/*============================*/
+				/* out: table flags */
 {
        /* Need to use tx_isolation here since table flags is (also)
           called before prebuilt is inited. */
@@ -2899,6 +2900,7 @@ UNIV_INTERN
 ulint
 ha_innobase::innobase_initialize_autoinc()
 /*======================================*/
+				/* out: DB_SUCCESS or error code */
 {
 	dict_index_t*	index;
 	ulonglong	auto_inc;
@@ -4765,6 +4767,7 @@ UNIV_INTERN
 int
 ha_innobase::index_end(void)
 /*========================*/
+				/* out: 0 */
 {
 	int	error	= 0;
 	DBUG_ENTER("index_end");
@@ -6442,8 +6445,7 @@ static
 void
 innobase_drop_database(
 /*===================*/
-			/* out: error number */
-        handlerton *hton, /* in: handlerton of Innodb */
+	handlerton *hton, /* in: handlerton of Innodb */
 	char*	path)	/* in: database path; inside InnoDB the name
 			of the last directory in the path is used as
 			the database name: for example, in 'mysql/data/test'
@@ -7447,6 +7449,7 @@ UNIV_INTERN
 bool
 ha_innobase::can_switch_engines(void)
 /*=================================*/
+				/* out: TRUE if can switch engines */
 {
 	bool	can_switch;
 
@@ -7945,9 +7948,9 @@ ha_innobase::transactional_table_lock(
 /****************************************************************************
 Here we export InnoDB status variables to MySQL.  */
 static
-int
-innodb_export_status()
-/*==================*/
+void
+innodb_export_status(void)
+/*======================*/
 {
 	if (innodb_inited) {
 		srv_export_innodb_status();

handler/win_delay_loader.cc

@@ -90,14 +90,19 @@ absolute address (VA). This is due to the pointers in the delay
 descriptor (ImgDelayDescr in delayimp.h) have been changed from
 VAs to RVAs to work on both 32- and 64-bit platforms. */
 template <class X>
-X PFromRva(RVA rva) {
+X PFromRva(
+/*=======*/
+			/* out: absolute virtual address */
+	RVA	rva)	/* in: relative virtual address */
+{
 	return X(PBYTE(&__ImageBase) + rva);
 }
 
 /***********************************************************************
 Convert to the old format for convenience. The structure as well as its
 element names follow the definition of ImgDelayDescr in delayimp.h. */
-struct InternalImgDelayDescr {
+struct InternalImgDelayDescr
+{
 	DWORD		grAttrs;	/* attributes */
 	LPCSTR		szName;		/* pointer to dll name */
 	HMODULE*	phmod;		/* address of module handle */
@@ -138,8 +143,7 @@ in the server:
 	_db_return_
 	_db_dump_
 
-The plugin will get those function pointers during the initialization.
-*/
+The plugin will get those function pointers during the initialization. */
 typedef void (__cdecl* pfn_db_enter_)(
 	const char*	_func_,
 	const char*	_file_,

include/dict0dict.h

@@ -484,7 +484,7 @@ UNIV_INTERN
 void
 dict_table_print_by_name(
 /*=====================*/
-	const char*	name);
+	const char*	name);	/* in: table name */
 /**************************************************************************
 Outputs info on foreign keys of a table. */
 UNIV_INTERN

include/mem0mem.h

@@ -250,8 +250,7 @@ mem_free_func(
 /*==========*/
 	void*		ptr,		/* in, own: buffer to be freed */
 	const char*	file_name,	/* in: file name where created */
-	ulint		line		/* in: line where created */
-);
+	ulint		line);		/* in: line where created */
 
 /**************************************************************************
 Duplicates a NUL-terminated string. */

include/mem0mem.ic

@@ -565,8 +565,7 @@ mem_free_func(
 /*==========*/
 	void*		ptr,		/* in, own: buffer to be freed */
 	const char*	file_name,	/* in: file name where created */
-	ulint		line		/* in: line where created */
-	)
+	ulint		line)		/* in: line where created */
 {
 	mem_heap_t*   heap;
 

include/page0page.h

@@ -939,7 +939,7 @@ UNIV_INTERN
 void
 page_header_print(
 /*==============*/
-	const page_t*	page);
+	const page_t*	page);	/* in: index page */
 /*******************************************************************
 This is used to print the contents of the page for
 debugging purposes. */

include/que0que.h

@@ -410,7 +410,7 @@ struct que_fork_struct{
 	sym_tab_t*	sym_tab;	/* symbol table of the query,
 					generated by the parser, or NULL
 					if the graph was created 'by hand' */
-	pars_info_t*	info;		/* in: info struct, or NULL */
+	pars_info_t*	info;		/* info struct, or NULL */
 	/* The following cur_... fields are relevant only in a select graph */
 
 	ulint		cur_end;	/* QUE_CUR_NOT_DEFINED, QUE_CUR_START,

include/srv0srv.h

@@ -518,7 +518,7 @@ Function to pass InnoDB status variables to MySQL */
 UNIV_INTERN
 void
 srv_export_innodb_status(void);
-/*=====================*/
+/*==========================*/
 
 /* Thread slot in the thread table */
 typedef struct srv_slot_struct	srv_slot_t;

srv/srv0srv.c

@@ -1767,6 +1767,7 @@ Function to pass InnoDB status variables to MySQL */
 UNIV_INTERN
 void
 srv_export_innodb_status(void)
+/*==========================*/
 {
 	mutex_enter(&srv_innodb_monitor_mutex);