r21002: Get rid of unused macros - merge change from 3_0_24

(This used to be commit 9d23cf0cc4a8974bf0cf74b219a1138383083360)

3 files changed, 40 insertions, 48 deletions

diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h
index 867f87515e..48a44948dc 100644
--- a/source3/include/smbprofile.h
+++ b/source3/include/smbprofile.h
@@ -757,10 +757,6 @@ struct profile_header {
 
 extern struct profile_header *profile_h;
 extern struct profile_stats *profile_p;
-extern struct timeval profile_starttime;
-extern struct timeval profile_endtime;
-extern struct timeval profile_starttime_nested;
-extern struct timeval profile_endtime_nested;
 extern BOOL do_profile_flag;
 extern BOOL do_profile_times;
 
@@ -846,8 +842,6 @@ static inline SMB_BIG_UINT profile_timestamp(void)
 		    profile_timestamp() - __profstamp_##x); \
 	}
 
-#define START_PROFILE_NESTED(x) START_PROFILE(x)
-#define END_PROFILE_NESTED(x) END_PROFILE(x)
 
 #else /* WITH_PROFILE */
 
@@ -856,10 +850,8 @@ static inline SMB_BIG_UINT profile_timestamp(void)
 #define DO_PROFILE_DEC_INC(x,y)
 #define DO_PROFILE_ADD(x,n)
 #define START_PROFILE(x)
-#define START_PROFILE_NESTED(x)
 #define START_PROFILE_BYTES(x,n)
 #define END_PROFILE(x)
-#define END_PROFILE_NESTED(x)
 
 #endif /* WITH_PROFILE */
 
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 84ea6a150f..07d345aacd 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -2744,44 +2744,44 @@ static int handle_nttrans(connection_struct *conn,
 	switch(state->call) {
 		case NT_TRANSACT_CREATE:
 		{
-			START_PROFILE_NESTED(NT_transact_create);
+			START_PROFILE(NT_transact_create);
 			outsize = call_nt_transact_create(conn, inbuf, outbuf,
 							  size, bufsize, 
 							&state->setup, state->setup_count,
 							&state->param, state->total_param, 
 							&state->data, state->total_data,
 							  state->max_data_return);
-			END_PROFILE_NESTED(NT_transact_create);
+			END_PROFILE(NT_transact_create);
 			break;
 		}
 
 		case NT_TRANSACT_IOCTL:
 		{
-			START_PROFILE_NESTED(NT_transact_ioctl);
+			START_PROFILE(NT_transact_ioctl);
 			outsize = call_nt_transact_ioctl(conn, inbuf, outbuf,
 							 size, bufsize, 
 							 &state->setup, state->setup_count,
 							 &state->param, state->total_param, 
 							 &state->data, state->total_data, state->max_data_return);
-			END_PROFILE_NESTED(NT_transact_ioctl);
+			END_PROFILE(NT_transact_ioctl);
 			break;
 		}
 
 		case NT_TRANSACT_SET_SECURITY_DESC:
 		{
-			START_PROFILE_NESTED(NT_transact_set_security_desc);
+			START_PROFILE(NT_transact_set_security_desc);
 			outsize = call_nt_transact_set_security_desc(conn, inbuf, outbuf, 
 							 size, bufsize, 
 							 &state->setup, state->setup_count,
 							 &state->param, state->total_param, 
 							 &state->data, state->total_data, state->max_data_return);
-			END_PROFILE_NESTED(NT_transact_set_security_desc);
+			END_PROFILE(NT_transact_set_security_desc);
 			break;
 		}
 
 		case NT_TRANSACT_NOTIFY_CHANGE:
 		{
-			START_PROFILE_NESTED(NT_transact_notify_change);
+			START_PROFILE(NT_transact_notify_change);
 			outsize = call_nt_transact_notify_change(
 				conn, inbuf, outbuf, size, bufsize, 
 				&state->setup, state->setup_count,
@@ -2789,56 +2789,56 @@ static int handle_nttrans(connection_struct *conn,
 				&state->data, state->total_data,
 				state->max_data_return,
 				state->max_param_return);
-			END_PROFILE_NESTED(NT_transact_notify_change);
+			END_PROFILE(NT_transact_notify_change);
 			break;
 		}
 
 		case NT_TRANSACT_RENAME:
 		{
-			START_PROFILE_NESTED(NT_transact_rename);
+			START_PROFILE(NT_transact_rename);
 			outsize = call_nt_transact_rename(conn, inbuf, outbuf,
 							 size, bufsize, 
 							 &state->setup, state->setup_count,
 							 &state->param, state->total_param, 
 							 &state->data, state->total_data, state->max_data_return);
-			END_PROFILE_NESTED(NT_transact_rename);
+			END_PROFILE(NT_transact_rename);
 			break;
 		}
 
 		case NT_TRANSACT_QUERY_SECURITY_DESC:
 		{
-			START_PROFILE_NESTED(NT_transact_query_security_desc);
+			START_PROFILE(NT_transact_query_security_desc);
 			outsize = call_nt_transact_query_security_desc(conn, inbuf, outbuf, 
 							 size, bufsize, 
 							 &state->setup, state->setup_count,
 							 &state->param, state->total_param, 
 							 &state->data, state->total_data, state->max_data_return);
-			END_PROFILE_NESTED(NT_transact_query_security_desc);
+			END_PROFILE(NT_transact_query_security_desc);
 			break;
 		}
 
 #ifdef HAVE_SYS_QUOTAS
 		case NT_TRANSACT_GET_USER_QUOTA:
 		{
-			START_PROFILE_NESTED(NT_transact_get_user_quota);
+			START_PROFILE(NT_transact_get_user_quota);
 			outsize = call_nt_transact_get_user_quota(conn, inbuf, outbuf, 
 							 size, bufsize, 
 							 &state->setup, state->setup_count,
 							 &state->param, state->total_param, 
 							 &state->data, state->total_data, state->max_data_return);
-			END_PROFILE_NESTED(NT_transact_get_user_quota);
+			END_PROFILE(NT_transact_get_user_quota);
 			break;
 		}
 
 		case NT_TRANSACT_SET_USER_QUOTA:
 		{
-			START_PROFILE_NESTED(NT_transact_set_user_quota);
+			START_PROFILE(NT_transact_set_user_quota);
 			outsize = call_nt_transact_set_user_quota(conn, inbuf, outbuf, 
 							 size, bufsize, 
 							 &state->setup, state->setup_count,
 							 &state->param, state->total_param, 
 							 &state->data, state->total_data, state->max_data_return);
-			END_PROFILE_NESTED(NT_transact_set_user_quota);
+			END_PROFILE(NT_transact_set_user_quota);
 			break;					
 		}
 #endif /* HAVE_SYS_QUOTAS */
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index b35b27f276..8afd3de130 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -5091,147 +5091,147 @@ int handle_trans2(connection_struct *conn,
 	switch(state->call)  {
 	case TRANSACT2_OPEN:
 	{
-		START_PROFILE_NESTED(Trans2_open);
+		START_PROFILE(Trans2_open);
 		outsize = call_trans2open(
 			conn, inbuf, outbuf, bufsize, 
 			&state->param, state->total_param,
 			&state->data, state->total_data,
 			state->max_data_return);
-		END_PROFILE_NESTED(Trans2_open);
+		END_PROFILE(Trans2_open);
 		break;
 	}
 
 	case TRANSACT2_FINDFIRST:
 	{
-		START_PROFILE_NESTED(Trans2_findfirst);
+		START_PROFILE(Trans2_findfirst);
 		outsize = call_trans2findfirst(
 			conn, inbuf, outbuf, bufsize,
 			&state->param, state->total_param,
 			&state->data, state->total_data,
 			state->max_data_return);
-		END_PROFILE_NESTED(Trans2_findfirst);
+		END_PROFILE(Trans2_findfirst);
 		break;
 	}
 
 	case TRANSACT2_FINDNEXT:
 	{
-		START_PROFILE_NESTED(Trans2_findnext);
+		START_PROFILE(Trans2_findnext);
 		outsize = call_trans2findnext(
 			conn, inbuf, outbuf, size, bufsize, 
 			&state->param, state->total_param,
 			&state->data, state->total_data,
 			state->max_data_return);
-		END_PROFILE_NESTED(Trans2_findnext);
+		END_PROFILE(Trans2_findnext);
 		break;
 	}
 
 	case TRANSACT2_QFSINFO:
 	{
-		START_PROFILE_NESTED(Trans2_qfsinfo);
+		START_PROFILE(Trans2_qfsinfo);
 		outsize = call_trans2qfsinfo(
 			conn, inbuf, outbuf, size, bufsize,
 			&state->param, state->total_param,
 			&state->data, state->total_data,
 			state->max_data_return);
-		END_PROFILE_NESTED(Trans2_qfsinfo);
+		END_PROFILE(Trans2_qfsinfo);
 	    break;
 	}
 
 	case TRANSACT2_SETFSINFO:
 	{
-		START_PROFILE_NESTED(Trans2_setfsinfo);
+		START_PROFILE(Trans2_setfsinfo);
 		outsize = call_trans2setfsinfo(
 			conn, inbuf, outbuf, size, bufsize, 
 			&state->param, state->total_param,
 			&state->data, state->total_data,
 			state->max_data_return);
-		END_PROFILE_NESTED(Trans2_setfsinfo);
+		END_PROFILE(Trans2_setfsinfo);
 		break;
 	}
 
 	case TRANSACT2_QPATHINFO:
 	case TRANSACT2_QFILEINFO:
 	{
-		START_PROFILE_NESTED(Trans2_qpathinfo);
+		START_PROFILE(Trans2_qpathinfo);
 		outsize = call_trans2qfilepathinfo(
 			conn, inbuf, outbuf, size, bufsize, state->call,
 			&state->param, state->total_param,
 			&state->data, state->total_data,
 			state->max_data_return);
-		END_PROFILE_NESTED(Trans2_qpathinfo);
+		END_PROFILE(Trans2_qpathinfo);
 		break;
 	}
 
 	case TRANSACT2_SETPATHINFO:
 	case TRANSACT2_SETFILEINFO:
 	{
-		START_PROFILE_NESTED(Trans2_setpathinfo);
+		START_PROFILE(Trans2_setpathinfo);
 		outsize = call_trans2setfilepathinfo(
 			conn, inbuf, outbuf, size, bufsize, state->call,
 			&state->param, state->total_param,
 			&state->data, state->total_data,
 			state->max_data_return);
-		END_PROFILE_NESTED(Trans2_setpathinfo);
+		END_PROFILE(Trans2_setpathinfo);
 		break;
 	}
 
 	case TRANSACT2_FINDNOTIFYFIRST:
 	{
-		START_PROFILE_NESTED(Trans2_findnotifyfirst);
+		START_PROFILE(Trans2_findnotifyfirst);
 		outsize = call_trans2findnotifyfirst(
 			conn, inbuf, outbuf, size, bufsize, 
 			&state->param, state->total_param,
 			&state->data, state->total_data,
 			state->max_data_return);
-		END_PROFILE_NESTED(Trans2_findnotifyfirst);
+		END_PROFILE(Trans2_findnotifyfirst);
 		break;
 	}
 
 	case TRANSACT2_FINDNOTIFYNEXT:
 	{
-		START_PROFILE_NESTED(Trans2_findnotifynext);
+		START_PROFILE(Trans2_findnotifynext);
 		outsize = call_trans2findnotifynext(
 			conn, inbuf, outbuf, size, bufsize, 
 			&state->param, state->total_param,
 			&state->data, state->total_data,
 			state->max_data_return);
-		END_PROFILE_NESTED(Trans2_findnotifynext);
+		END_PROFILE(Trans2_findnotifynext);
 		break;
 	}
 
 	case TRANSACT2_MKDIR:
 	{
-		START_PROFILE_NESTED(Trans2_mkdir);
+		START_PROFILE(Trans2_mkdir);
 		outsize = call_trans2mkdir(
 			conn, inbuf, outbuf, size, bufsize,
 			&state->param, state->total_param,
 			&state->data, state->total_data,
 			state->max_data_return);
-		END_PROFILE_NESTED(Trans2_mkdir);
+		END_PROFILE(Trans2_mkdir);
 		break;
 	}
 
 	case TRANSACT2_GET_DFS_REFERRAL:
 	{
-		START_PROFILE_NESTED(Trans2_get_dfs_referral);
+		START_PROFILE(Trans2_get_dfs_referral);
 		outsize = call_trans2getdfsreferral(
 			conn, inbuf, outbuf, size, bufsize,
 			&state->param, state->total_param,
 			&state->data, state->total_data,
 			state->max_data_return);
-		END_PROFILE_NESTED(Trans2_get_dfs_referral);
+		END_PROFILE(Trans2_get_dfs_referral);
 		break;
 	}
 
 	case TRANSACT2_IOCTL:
 	{
-		START_PROFILE_NESTED(Trans2_ioctl);
+		START_PROFILE(Trans2_ioctl);
 		outsize = call_trans2ioctl(
 			conn, inbuf, outbuf, size, bufsize,
 			&state->param, state->total_param,
 			&state->data, state->total_data,
 			state->max_data_return);
-		END_PROFILE_NESTED(Trans2_ioctl);
+		END_PROFILE(Trans2_ioctl);
 		break;
 	}