From 68d32db60e3ba04341b00ac7886c620a0bae3ee9 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sat, 11 May 2013 20:20:38 +0100 Subject: [PATCH] Sort all libtool symbol lists The original plan for the libtool symbol lists was that they be in alphabetical order. This should make them easier to maintain, as it becomes harder to accidentaly introduce duplicates, and makes merge conflicts when adding new symbols less likely. However, not all of them are properly sorted. Update the ones that aren't. This was done with for A in `find . -name *.la.sym`; do sort $A -o $A; done Change-Id: I6a3fd621098466e8275b2e42c0fe54cfb38b5128 Reviewed-on: http://gerrit.openafs.org/9900 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Reviewed-by: Derrick Brashear --- src/auth/liboafs_auth.la.sym | 4 +- src/cmd/liboafs_cmd.la.sym | 40 ++--- src/comerr/liboafs_comerr.la.sym | 10 +- src/kauth/liboafs_kauth.la.sym | 10 +- src/libafsauthent/libafsauthent.la.sym | 26 ++-- src/libafsrpc/libafsrpc.la.sym | 260 ++++++++++++++++----------------- src/lwp/liboafs_lwpcompat.la.sym | 8 +- src/opr/liboafs_opr.la.sym | 16 +- src/rx/liboafs_rx.la.sym | 2 +- src/rxkad/liboafs_rxkad.la.sym | 6 +- src/ubik/liboafs_ubik.la.sym | 4 +- src/usd/liboafs_usd.la.sym | 2 +- src/util/liboafs_util.la.sym | 84 +++++------ src/vlserver/liboafs_vldb.la.sym | 8 +- 14 files changed, 240 insertions(+), 240 deletions(-) diff --git a/src/auth/liboafs_auth.la.sym b/src/auth/liboafs_auth.la.sym index 00f0d7f..1d08b24 100644 --- a/src/auth/liboafs_auth.la.sym +++ b/src/auth/liboafs_auth.la.sym @@ -30,21 +30,21 @@ afsconf_typedKey_put afsconf_typedKey_values initialize_ACFG_error_table initialize_KTC_error_table -ktc_curpag ktc_ForgetAllTokens ktc_GetToken ktc_GetTokenEx ktc_OldPioctl ktc_SetToken ktc_SetTokenEx +ktc_curpag token_FreeSet token_SetsEquivalent token_addToken token_buildTokenJar +token_extractRxkad token_freeToken token_importRxkadViceId token_replaceToken token_setPag token_setRxkadViceId -token_extractRxkad xdr_ktc_setTokenData diff --git a/src/cmd/liboafs_cmd.la.sym b/src/cmd/liboafs_cmd.la.sym index 7919eda..517b659 100644 --- a/src/cmd/liboafs_cmd.la.sym +++ b/src/cmd/liboafs_cmd.la.sym @@ -1,34 +1,34 @@ -cmd_CreateSyntax -cmd_CreateAlias cmd_AddParm -cmd_AddParmAtOffset cmd_AddParmAlias -cmd_Dispatch -cmd_Seek -cmd_SetBeforeProc -cmd_SetAfterProc +cmd_AddParmAtOffset +cmd_CreateAlias +cmd_CreateSyntax cmd_DisableAbbreviations cmd_DisablePositionalCommands -cmd_Parse -cmd_ParseLine -cmd_OptionAsList +cmd_Dispatch +cmd_FreeArgv +cmd_FreeOptions +cmd_IsAdministratorCommand +cmd_OpenConfigFile cmd_OptionAsFlag -cmd_OptionAsString cmd_OptionAsInt +cmd_OptionAsList +cmd_OptionAsString cmd_OptionAsUint cmd_OptionPresent -cmd_FreeOptions -cmd_FreeArgv -cmd_IsAdministratorCommand -initialize_CMD_error_table -cmd_RawConfigParseFileMulti -cmd_RawConfigParseFile +cmd_Parse +cmd_ParseLine cmd_RawConfigFileFree -cmd_RawConfigGetString cmd_RawConfigGetBool cmd_RawConfigGetInt cmd_RawConfigGetList -cmd_OpenConfigFile -cmd_SetCommandName +cmd_RawConfigGetString +cmd_RawConfigParseFile +cmd_RawConfigParseFileMulti cmd_RawFile cmd_RawSection +cmd_Seek +cmd_SetAfterProc +cmd_SetBeforeProc +cmd_SetCommandName +initialize_CMD_error_table diff --git a/src/comerr/liboafs_comerr.la.sym b/src/comerr/liboafs_comerr.la.sym index 3b05985..c130e2a 100644 --- a/src/comerr/liboafs_comerr.la.sym +++ b/src/comerr/liboafs_comerr.la.sym @@ -1,10 +1,10 @@ +afs_add_to_error_table afs_com_err afs_com_err_va -afs_error_table_name +afs_com_right +afs_com_right_r afs_error_message afs_error_message_localize -afs_set_com_err_hook +afs_error_table_name afs_reset_com_err_hook -afs_add_to_error_table -afs_com_right_r -afs_com_right +afs_set_com_err_hook diff --git a/src/kauth/liboafs_kauth.la.sym b/src/kauth/liboafs_kauth.la.sym index 8c71c8f..f7f6327 100644 --- a/src/kauth/liboafs_kauth.la.sym +++ b/src/kauth/liboafs_kauth.la.sym @@ -1,9 +1,9 @@ initialize_KA_error_table -ka_VerifyUserPassword -ka_UserAuthenticateGeneral +ka_AuthServerConn +ka_ChangePassword +ka_GetAdminToken ka_Init ka_LocalCell ka_StringToKey -ka_GetAdminToken -ka_AuthServerConn -ka_ChangePassword +ka_UserAuthenticateGeneral +ka_VerifyUserPassword diff --git a/src/libafsauthent/libafsauthent.la.sym b/src/libafsauthent/libafsauthent.la.sym index 9a7bdfb..50f5e83 100644 --- a/src/libafsauthent/libafsauthent.la.sym +++ b/src/libafsauthent/libafsauthent.la.sym @@ -1,3 +1,4 @@ +afs_get_pag_from_groups afsconf_AddKey afsconf_AddUser afsconf_CellApply @@ -18,9 +19,10 @@ afsconf_Open afsconf_ServerAuth afsconf_SetCellInfo afsconf_SetNoAuthFlag -afsconf_SuperUser afsconf_SetSecurityFlags +afsconf_SuperUser ka_AuthServerConn +ka_AuthSpecificServersConn ka_Authenticate ka_CellConfig ka_CellToRealm @@ -34,12 +36,12 @@ ka_GetServerToken ka_GetServers ka_GetToken ka_Init +ka_KeyCheckSum ka_LocalCell ka_ParseLoginName ka_ReadPassword ka_SingleServerConn ka_StringToKey -ka_KeyCheckSum ka_UserAuthenticateGeneral ka_VerifyUserToken ktc_ForgetAllTokens @@ -49,21 +51,19 @@ ktc_ListTokens ktc_OldPioctl ktc_SetToken ktc_curpag -ubik_Call -ubik_Call_New -ubik_CallIter -ubik_ClientDestroy -ubik_ClientInit -ubik_ParseClientList pioctl -ka_AuthSpecificServersConn +pr_End pr_GetCPS -pr_Initialize pr_GetHostCPS -pr_NameToId pr_IdToName +pr_Initialize pr_ListMembers -pr_End +pr_NameToId pr_SNameToId -afs_get_pag_from_groups setpag +ubik_Call +ubik_CallIter +ubik_Call_New +ubik_ClientDestroy +ubik_ClientInit +ubik_ParseClientList diff --git a/src/libafsrpc/libafsrpc.la.sym b/src/libafsrpc/libafsrpc.la.sym index ea00c3e..b1858a9 100644 --- a/src/libafsrpc/libafsrpc.la.sym +++ b/src/libafsrpc/libafsrpc.la.sym @@ -1,34 +1,162 @@ +FT_GetTimeOfDay +RXSTATS_ClearPeerRPCStats +RXSTATS_ClearProcessRPCStats +RXSTATS_DisablePeerRPCStats +RXSTATS_DisableProcessRPCStats +RXSTATS_EnablePeerRPCStats +RXSTATS_EnableProcessRPCStats +RXSTATS_ExecuteRequest +RXSTATS_QueryPeerRPCStats +RXSTATS_QueryProcessRPCStats +RXSTATS_QueryRPCStatsVersion +RXSTATS_RetrievePeerRPCStats +RXSTATS_RetrieveProcessRPCStats +TM_GetTimeOfDay +afs_add_to_error_table +afs_com_err +afs_error_message +afs_error_table_name +afs_xdr_alloc +afs_xdr_array +afs_xdr_bytes +afs_xdr_char +afs_xdr_enum +afs_xdr_free +afs_xdr_int +afs_xdr_opaque +afs_xdr_pointer +afs_xdr_short +afs_xdr_string +afs_xdr_u_char +afs_xdr_vector +afs_xdrmem_create +hton_syserr_conv +initialize_RXK_error_table ktohl life_to_time +multi_Finalize +multi_Finalize_Ignore +multi_Init +multi_Select osi_AssertFailU osi_Panic +rx_ConnError +rx_ConnectionOf rx_DestroyConnection rx_EndCall rx_Finalize +rx_FlushWrite +rx_FreeRPCStats rx_GetCachedConnection rx_GetCall +rx_GetConnectionEpoch +rx_GetConnectionId rx_GetIFInfo +rx_GetLocalPeers +rx_GetMaxReceiveWindow +rx_GetMaxSendWindow +rx_GetMinPeerTimeout +rx_GetNetworkError +rx_GetSecurityData +rx_GetSecurityHeaderSize +rx_GetServerConnections +rx_GetServerDebug +rx_GetServerPeers +rx_GetServerStats +rx_GetServerVersion rx_GetSpecific +rx_HostOf +rx_IncrementTimeAndCount rx_Init rx_InitHost +rx_InterruptCall +rx_KeepAliveOff +rx_KeepAliveOn rx_KeyCreate +rx_MyMaxSendSize rx_NewCall rx_NewConnection rx_NewService +rx_PeerOf +rx_PortOf rx_PrintPeerStats rx_PrintStats rx_PrintTheseStats rx_ReadProc +rx_RecordCallStatistics rx_ReleaseCachedConnection +rx_RetrievePeerRPCStats +rx_RetrieveProcessRPCStats +rx_SecurityClassOf +rx_SecurityObjectOf rx_ServerProc +rx_ServiceIdOf +rx_ServiceOf +rx_SetBusyChannelError +rx_SetConnDeadTime +rx_SetConnHardDeadTime +rx_SetConnIdleDeadTime +rx_SetMaxReceiveWindow +rx_SetMaxSendWindow +rx_SetMinPeerTimeout +rx_SetNoJumbo +rx_SetSecurityData +rx_SetSecurityHeaderSize +rx_SetSecurityMaxTrailerSize rx_SetSpecific +rx_SlowReadPacket +rx_SlowWritePacket rx_StartServer +rx_UdpBufSize rx_WriteProc +rx_connDeadTime +rx_debugFile +rx_disablePeerRPCStats +rx_disableProcessRPCStats +rx_enablePeerRPCStats +rx_enableProcessRPCStats +rx_enable_stats +rx_extraPackets +rx_extraQuota +rx_getAllAddr +rx_getAllAddrMaskMtu +rx_identity_copy +rx_identity_copyContents +rx_identity_free +rx_identity_freeContents +rx_identity_match +rx_identity_new +rx_identity_populate +rx_maxReceiveSize +rx_nWaiting +rx_opaque_alloc +rx_opaque_copy +rx_opaque_free +rx_opaque_freeContents +rx_opaque_new +rx_opaque_populate +rx_opaque_zeroFree +rx_opaque_zeroFreeContents +rx_queryPeerRPCStats +rx_queryProcessRPCStats +rx_socket +rx_thread_id_key +rx_tranquil rxevent_Init rxevent_Post +rxevent_debugFile +rxi_Alloc +rxi_AllocDataBuf +rxi_Free +rxi_GetCallNumberVector +rxi_RoundUpPacket +rxi_SetCallNumberVector rxkad_GetServerInfo rxkad_NewClientSecurityObject rxkad_NewServerSecurityObject +rxkad_global_stats +rxkad_global_stats_lock +rxkad_stats_key rxnull_NewClientSecurityObject rxnull_NewServerSecurityObject rxs_Release @@ -36,138 +164,10 @@ time_to_life tkt_CheckTimes tkt_DecodeTicket tkt_MakeTicket -xdrrx_create -hton_syserr_conv -rxkad_global_stats -rxkad_global_stats_lock -rxkad_stats_key -afs_com_err -afs_error_message -afs_error_table_name -rx_socket -rxevent_debugFile -rx_debugFile -rx_connDeadTime -rx_maxReceiveSize -rx_UdpBufSize -rx_extraQuota -rx_extraPackets -rx_tranquil -rx_getAllAddr -rx_nWaiting -rx_SetNoJumbo -rx_SetConnDeadTime -rx_SetConnHardDeadTime -rx_SetConnIdleDeadTime -rx_FlushWrite -rx_thread_id_key -multi_Finalize -multi_Select -multi_Init -multi_Finalize_Ignore -afs_add_to_error_table xdr_afsUUID xdr_afs_int32 -xdr_afs_uint32 xdr_afs_int64 +xdr_afs_uint32 xdr_afs_uint64 -rx_IncrementTimeAndCount -rx_enable_stats -rx_GetServerDebug -rx_GetServerStats -rx_GetServerVersion -rx_GetServerConnections -rx_GetServerPeers -rx_RetrieveProcessRPCStats -rx_RetrievePeerRPCStats -rx_FreeRPCStats -rx_queryProcessRPCStats -rx_queryPeerRPCStats -rx_enableProcessRPCStats -rx_enablePeerRPCStats -rx_disableProcessRPCStats -rx_disablePeerRPCStats -RXSTATS_ExecuteRequest -RXSTATS_RetrieveProcessRPCStats -RXSTATS_RetrievePeerRPCStats -RXSTATS_QueryProcessRPCStats -RXSTATS_QueryPeerRPCStats -RXSTATS_EnableProcessRPCStats -RXSTATS_EnablePeerRPCStats -RXSTATS_DisableProcessRPCStats -RXSTATS_DisablePeerRPCStats -RXSTATS_QueryRPCStatsVersion -RXSTATS_ClearProcessRPCStats -RXSTATS_ClearPeerRPCStats -TM_GetTimeOfDay -FT_GetTimeOfDay -rx_GetLocalPeers -rx_GetMaxReceiveWindow -rx_GetMaxSendWindow -rx_SetMaxReceiveWindow -rx_SetMaxSendWindow -rx_GetMinPeerTimeout -rx_SetMinPeerTimeout -afs_xdr_alloc -afs_xdr_array -afs_xdr_bytes -afs_xdr_char -afs_xdr_u_char -afs_xdr_enum -afs_xdr_free -afs_xdr_int -afs_xdr_opaque -afs_xdr_short -afs_xdr_string -afs_xdr_vector -afs_xdr_pointer -afs_xdrmem_create xdrlen_create -rxi_GetCallNumberVector -rxi_SetCallNumberVector -rxi_RoundUpPacket -rx_SlowReadPacket -rx_SlowWritePacket -rxi_Alloc -rxi_AllocDataBuf -rx_MyMaxSendSize -rxi_Free -rx_opaque_new -rx_opaque_alloc -rx_opaque_populate -rx_opaque_copy -rx_opaque_freeContents -rx_opaque_zeroFreeContents -rx_opaque_free -rx_opaque_zeroFree -rx_identity_match -rx_identity_populate -rx_identity_copy -rx_identity_copyContents -rx_identity_new -rx_identity_freeContents -rx_identity_free -rx_InterruptCall -rx_SetBusyChannelError -rx_PeerOf -rx_SecurityClassOf -rx_ServiceIdOf -rx_SecurityObjectOf -rx_ConnError -rx_ConnectionOf -rx_RecordCallStatistics -rx_KeepAliveOn -rx_KeepAliveOff -rx_ServiceOf -rx_GetSecurityData -rx_SetSecurityData -rx_GetConnectionId -rx_GetConnectionEpoch -rx_GetSecurityHeaderSize -rx_SetSecurityHeaderSize -rx_SetSecurityMaxTrailerSize -rx_HostOf -rx_PortOf -initialize_RXK_error_table -rx_getAllAddrMaskMtu -rx_GetNetworkError +xdrrx_create diff --git a/src/lwp/liboafs_lwpcompat.la.sym b/src/lwp/liboafs_lwpcompat.la.sym index 80e4a53..41aa57e 100644 --- a/src/lwp/liboafs_lwpcompat.la.sym +++ b/src/lwp/liboafs_lwpcompat.la.sym @@ -1,9 +1,9 @@ -FT_ApproxTime -FT_GetTimeOfDay -Lock_Init Afs_Lock_Obtain Afs_Lock_ReleaseR Afs_Lock_ReleaseW Afs_Lock_WakeupR -LWP_WaitForKeystroke +FT_ApproxTime +FT_GetTimeOfDay LWP_GetResponseKey +LWP_WaitForKeystroke +Lock_Init diff --git a/src/opr/liboafs_opr.la.sym b/src/opr/liboafs_opr.la.sym index 8d10b37..cc0466d 100644 --- a/src/opr/liboafs_opr.la.sym +++ b/src/opr/liboafs_opr.la.sym @@ -1,15 +1,15 @@ -opr_lcstring -opr_ucstring -opr_stolower -opr_stoupper -opr_strcompose opr_AssertionFailed -opr_dict_Init opr_dict_Free +opr_dict_Init +opr_lcstring opr_rbtree_first +opr_rbtree_init +opr_rbtree_insert opr_rbtree_next opr_rbtree_remove opr_rbtree_replace opr_rbtree_replace -opr_rbtree_insert -opr_rbtree_init +opr_stolower +opr_stoupper +opr_strcompose +opr_ucstring diff --git a/src/rx/liboafs_rx.la.sym b/src/rx/liboafs_rx.la.sym index 92ce66e..26902e7 100644 --- a/src/rx/liboafs_rx.la.sym +++ b/src/rx/liboafs_rx.la.sym @@ -37,6 +37,7 @@ rx_GetConnection rx_GetConnectionEpoch rx_GetConnectionId rx_GetIFInfo +rx_GetNetworkError rx_GetSecurityData rx_GetSecurityHeaderSize rx_GetSpecific @@ -155,4 +156,3 @@ xdr_afs_uint32 xdr_afs_uint64 xdrlen_create xdrrx_create -rx_GetNetworkError diff --git a/src/rxkad/liboafs_rxkad.la.sym b/src/rxkad/liboafs_rxkad.la.sym index e926ed3..7590599 100644 --- a/src/rxkad/liboafs_rxkad.la.sym +++ b/src/rxkad/liboafs_rxkad.la.sym @@ -1,8 +1,8 @@ +initialize_RXK_error_table life_to_time +rxkad_GetServerInfo rxkad_NewClientSecurityObject rxkad_NewServerSecurityObject -rxkad_GetServerInfo time_to_life -tkt_MakeTicket tkt_CheckTimes -initialize_RXK_error_table +tkt_MakeTicket diff --git a/src/ubik/liboafs_ubik.la.sym b/src/ubik/liboafs_ubik.la.sym index db5b0bb..679bad6 100644 --- a/src/ubik/liboafs_ubik.la.sym +++ b/src/ubik/liboafs_ubik.la.sym @@ -1,3 +1,5 @@ +EndDISK_GetFile +StartDISK_GetFile VOTE_Debug VOTE_DebugOld VOTE_GetSyncSite @@ -5,8 +7,6 @@ VOTE_SDebug VOTE_SDebugOld VOTE_XDebug VOTE_XSDebug -StartDISK_GetFile -EndDISK_GetFile initialize_U_error_table ubik_AbortTrans ubik_BeginTrans diff --git a/src/usd/liboafs_usd.la.sym b/src/usd/liboafs_usd.la.sym index e284928..0618548 100644 --- a/src/usd/liboafs_usd.la.sym +++ b/src/usd/liboafs_usd.la.sym @@ -1,3 +1,3 @@ +usd_Open usd_StandardInput usd_StandardOutput -usd_Open diff --git a/src/util/liboafs_util.la.sym b/src/util/liboafs_util.la.sym index d493a3d..3fb184a 100644 --- a/src/util/liboafs_util.la.sym +++ b/src/util/liboafs_util.la.sym @@ -1,53 +1,53 @@ -afs_inet_ntoa_r -hostutil_GetHostByName -hostutil_GetNameByINet -gettmpdir -util_GetInt32 -util_GetInt64 -OpenLog -ReOpenLog +Add_RelDate_to_Time +BufioClose +BufioGets +BufioOpen +FSLog +Int32To_ktimeRelDate +LogCommandLine LogLevel LogThreadNum -LogCommandLine -FSLog -serverLogSyslogFacility -serverLogSyslog -serverLogSyslogTag -SetupLogSignals +OpenLog +ReOpenLog SetLogThreadNumProgram -grmutex -getDirPath -initAFSDirPath -pthread_recursive_mutex_lock -pthread_recursive_mutex_unlock -vFSLog -BufioOpen -BufioGets -BufioClose -afs_uuid_equal -afs_uuid_is_nil -afsUUID_to_string +SetupLogSignals afsUUID_from_string -afs_ntohuuid +afsUUID_to_string afs_htonuuid -volutil_GetPartitionID -volutil_PartitionName -volutil_PartitionName_r -volutil_PartitionName2_r -flipbase64_to_int64 -int64_to_flipbase64 -util_GetHumanInt32 -util_GetUInt32 -ktime_DateToInt32 +afs_inet_ntoa_r +afs_ntohuuid afs_pthread_setname_self -Int32To_ktimeRelDate -Add_RelDate_to_Time -softsig_signal -softsig_init afs_uuid_create +afs_uuid_equal afs_uuid_hash -mrafsStyleLogs +afs_uuid_is_nil +flipbase64_to_int64 +getDirPath +getDirPath +gettmpdir +grmutex grmutex +hostutil_GetHostByName +hostutil_GetNameByINet +initAFSDirPath +int64_to_flipbase64 +ktime_DateToInt32 +mrafsStyleLogs +pthread_recursive_mutex_lock pthread_recursive_mutex_lock pthread_recursive_mutex_unlock -getDirPath +pthread_recursive_mutex_unlock +serverLogSyslog +serverLogSyslogFacility +serverLogSyslogTag +softsig_init +softsig_signal +util_GetHumanInt32 +util_GetInt32 +util_GetInt64 +util_GetUInt32 +vFSLog +volutil_GetPartitionID +volutil_PartitionName +volutil_PartitionName2_r +volutil_PartitionName_r diff --git a/src/vlserver/liboafs_vldb.la.sym b/src/vlserver/liboafs_vldb.la.sym index ea9c653..9b59b83 100644 --- a/src/vlserver/liboafs_vldb.la.sym +++ b/src/vlserver/liboafs_vldb.la.sym @@ -1,4 +1,7 @@ +EndVL_ProbeServer +StartVL_ProbeServer VL_GetEntryByNameO +VL_ProbeServer initialize_VL_error_table ubik_VL_ChangeAddr ubik_VL_CreateEntry @@ -19,6 +22,7 @@ ubik_VL_ListAttributes ubik_VL_ListAttributesN ubik_VL_ListAttributesN2 ubik_VL_ListEntry +ubik_VL_ProbeServer ubik_VL_RegisterAddrs ubik_VL_ReleaseLock ubik_VL_ReplaceEntry @@ -28,7 +32,3 @@ ubik_VL_UpdateEntry ubik_VL_UpdateEntryByName xdr_bulkaddrs xdr_bulkentries -VL_ProbeServer -EndVL_ProbeServer -StartVL_ProbeServer -ubik_VL_ProbeServer -- 1.9.4