diff --git a/BUILDING_MACOSX.txt b/BUILDING_MACOSX.txt index 31b410e6de..608f8f104c 100644 --- a/BUILDING_MACOSX.txt +++ b/BUILDING_MACOSX.txt @@ -9,7 +9,7 @@ WXVERSION=svn WXPORT=cocoa MULECLEAN=YES ../src/utils/scripts/MacOSX/full_build. Those commands would build a MacOSX 10.6 (Snow Leopard) compatible application bundle for aMule and aMuleGUI -using the architecture of the build system ( i386 or x86_64 ), with the latest SVN vesion of wxWidgets. +using the architecture of the build system ( i386 or x86_64 ), with the latest SVN version of wxWidgets. Other parameters are explained upon execution of the script. diff --git a/README.Debian-Packages b/README.Debian-Packages index 3332cda378..fd1e065f0c 100644 --- a/README.Debian-Packages +++ b/README.Debian-Packages @@ -37,14 +37,14 @@ amule-utils-gui Creates the Metapackage for the graphical utilities and all the * alc * remotegui * wxcas -i18n- Builds the coresponding i18n-packge. Lang has to be one of ar, ast, bg, ca, cs, +i18n- Builds the corresponding i18n-packge. Lang has to be one of ar, ast, bg, ca, cs, da, de, el, es, et-ee, eu, fi, fr, gl, he, hr, hu, it, it-ch, ja, ko-kr, lt, nl, nn, pl, pt-br, pt-pt, ro, ru, sl, sq, sv, tr, uk, zh-cn or zh-tw If no i18n-package is given, all will be build. If you just want en_GB, use i18n-en-only -If one of the -dbg targets is choosen, the corresponding binary will be built, too. In this case, -debugging is enabled, optimising is disabled. Is no -dbg target choosen, debugging is disabled, +If one of the -dbg targets is chosen, the corresponding binary will be built, too. In this case, +debugging is enabled, optimising is disabled. Is no -dbg target chosen, debugging is disabled, optimising is enabled. If you choose to just build a few packages, you have to explicit activate ed2k or xas if diff --git a/README.md b/README.md index 5cf3d87e75..387d0b3e8b 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ You can contribute to aMule several ways: [translate aMule's documentation][9] to your language. * Fixing the wiki. aMule's wiki contains a lot of old, outdated information, that is simply not true anymore. One should read through the pages, update - manuals and references and remove obsolate information. + manuals and references and remove obsolete information. [6]: https://github.com/amule-project/amule/pulls "aMule Pull Requests" [7]: http://wiki.amule.org/wiki/Translations "Translating aMule" diff --git a/amule_build_install.sh b/amule_build_install.sh index 138cbf7abc..ef4ee7351c 100755 --- a/amule_build_install.sh +++ b/amule_build_install.sh @@ -42,7 +42,7 @@ function lookup_distro { #echo $2 # evaluates to XXX_FILENAME #echo ${!2} # evaluates to /home/user/dir/xxx-y.z.t.tar.gz - # remove the directory and the extension parts and assing it + # remove the directory and the extension parts and assign it # to XXX_DISTRO in $3 case ${!2} in *.gz) @@ -92,7 +92,7 @@ function init_package_versions { lookup_distro 'aMule-*' AMULE_FILENAME AMULE_DISTRO echo - echo "Software packacge versions:" + echo "Software package versions:" echo " cryptopp : $CRYPTOPP_DISTRO" echo " libupnp : $LIBUPNP_DISTRO" echo " wxWidgets : $WXWIDGETS_DISTRO" diff --git a/autogen.sh b/autogen.sh index cfb31867ef..e58e41078a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -35,7 +35,7 @@ if expr "$confver" \> "$gettext_version" >/dev/null; then exit 1 fi -# Force intl regenration to get last update from installed gettext templates +# Force intl regeneration to get last update from installed gettext templates rm -rf intl/* #if [ ! -d intl ]; then echo "Setting up internationalization files." diff --git a/cmake/wx.cmake b/cmake/wx.cmake index b91deb86a8..4e7cce73c4 100644 --- a/cmake/wx.cmake +++ b/cmake/wx.cmake @@ -26,7 +26,7 @@ # findWX module supports check of version # # Furthermore it sets the LIBS, LIBDIR and DEFS needed for compilation. -# This can be controled by setting wx_NEED_BASE and wx_NEED_GUI vars. +# This can be controlled by setting wx_NEED_BASE and wx_NEED_GUI vars. # include (CheckCXXSymbolExists) diff --git a/debian/TODO b/debian/TODO index 44d8fb7e1b..6bf19eb0a0 100644 --- a/debian/TODO +++ b/debian/TODO @@ -2,4 +2,4 @@ Make the packages that are ever build chooseable, too. Make a useable Startscript Add support for ed2k in the various browsers with debconf More cleanup -Let the theme for amuleweb be choosen by debconf +Let the theme for amuleweb be chosen by debconf diff --git a/debian/copyright b/debian/copyright index 52584300a8..ec18c4c220 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1006,7 +1006,7 @@ Copyright (c) Venkatesha Murthy G. src/RandomFunctions.cpp src/OtherFunctions.cpp -No Information aviable for +No Information available for aMule.app/Contents/Frameworks/libixml.2.dylib aMule.app/Contents/Frameworks/libthreadutil.2.dylib aMule.app/Contents/Frameworks/libupnp.3.dylib diff --git a/debian/rules b/debian/rules index ea33a414ab..50ef699537 100755 --- a/debian/rules +++ b/debian/rules @@ -528,7 +528,7 @@ plasmamule: amule-plasmamule-package plasmamule-dbgsym: amule-plasmamule-dbgsym touch @ -#Here come the Targets for the langauge packages +#Here come the Targets for the language packages i18n-%: amule-i18n-% ; amule-i18n-%: amule-common diff --git a/docs/Changelog b/docs/Changelog index 9f644b6a13..e0b9ac5881 100644 --- a/docs/Changelog +++ b/docs/Changelog @@ -1733,7 +1733,7 @@ Version 2.1.2 - The "We're on fire!" version the sharedfiles list showing a 'has-comment' flag. * Compilation fix for GCC 3.2. * Fixed CheckDirExists not working for root-paths (on both windows and - linux) and not handling all types of path-seperators on windows. + linux) and not handling all types of path-separators on windows. * Fixed security problems with aMuleWeb: * All images could be accessed, even when not logged in, and this included dynamically generated images, such as progress bars and diff --git a/docs/EC_Protocol.txt b/docs/EC_Protocol.txt index 5e3f948cee..cab11110e0 100644 --- a/docs/EC_Protocol.txt +++ b/docs/EC_Protocol.txt @@ -311,7 +311,7 @@ Section 3: Clarifying things 00 20 [...] EC_TAG_STATS_TOTAL_DL_COUNT 00 26 [...] EC_TAG_STATS_UL_QUEUE_LEN 00 24 [...] EC_TAG_STATS_BANNED_COUNT - And now the interesing part: + And now the interesting part: 00 13 EC_TAG_CONNSTATE. Note, that all tagnames are even numbers, so when we find an odd number, the true tag name is -1. EC_TAG_CONNSTATE = 0x0012, and 0x0013 - 1 = 0x0012, so it is really this one. The tagname being an odd number diff --git a/docs/INSTALL b/docs/INSTALL index 19bc1d4003..949df8e5b9 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -59,7 +59,7 @@ ADVANCED OPTIONS ------------------ - These are some of the availabe configure options: + These are some of the available configure options: --disable-debug disable additional debugging output --enable-optimize enable code optimizing diff --git a/docs/README b/docs/README index fc17499a09..70fe99f904 100644 --- a/docs/README +++ b/docs/README @@ -141,7 +141,7 @@ If these are non-functional, simply google for 'server.met'. - Tranfers icons + Transfers icons ---------------- To find descriptions of the various icons found inside aMule, take a look at http://wiki.amule.org/wiki/Getting_Started#Icons_and_What_They_Signify diff --git a/docs/man/amulecmd.1 b/docs/man/amulecmd.1 index 0335c5cecd..9ab406d3ff 100644 --- a/docs/man/amulecmd.1 +++ b/docs/man/amulecmd.1 @@ -136,7 +136,7 @@ Normal priority. .SS_untranslated Progress Shows the progress of an on\-going search. .SS_untranslated Quit -A synonim of the \fBexit\fR command. +A synonym of the \fBexit\fR command. .SS Reload \fI\fP Reloads a given object. diff --git a/m4/gettext.m4 b/m4/gettext.m4 index d779926e31..78e7309eee 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -425,7 +425,7 @@ AC_DEFUN([AM_PO_SUBDIRS], test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake. + # Hide the ALL_LINGUAS assignment from automake. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' fi case "$ac_given_srcdir" in diff --git a/m4/muleboost.m4 b/m4/muleboost.m4 index 899fd22647..96f241386f 100644 --- a/m4/muleboost.m4 +++ b/m4/muleboost.m4 @@ -54,7 +54,7 @@ esac # Adds a configure flag --with-boost[=DIR]. You may optionally specify the # location of boost headers (or sources), if they are in a non-standard # location. If --with-boost if not given, nothing is done. Otherwise it -# checks for the required minumum Boost version, and Boost.Asio. If everything +# checks for the required minimum Boost version, and Boost.Asio. If everything # is fine, defines ASIO_SOCKETS. If the Boost sources are found, also defines # HAVE_BOOST_SOURCES. Other flags defined for using Boost: # - BOOST_CPPFLAGS diff --git a/platforms/MacOSX/cocoa-mule/English.lproj/MainMenu.nib/designable.nib b/platforms/MacOSX/cocoa-mule/English.lproj/MainMenu.nib/designable.nib index 79e05294ef..58c80d7cfb 100644 --- a/platforms/MacOSX/cocoa-mule/English.lproj/MainMenu.nib/designable.nib +++ b/platforms/MacOSX/cocoa-mule/English.lproj/MainMenu.nib/designable.nib @@ -2074,7 +2074,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ 68288064 272761856 - Conection status + Connection status diff --git a/platforms/Windows/MSVC10/libs/libGeoIP/readme.txt b/platforms/Windows/MSVC10/libs/libGeoIP/readme.txt index 47fc2f66b0..e62e40a8b6 100644 --- a/platforms/Windows/MSVC10/libs/libGeoIP/readme.txt +++ b/platforms/Windows/MSVC10/libs/libGeoIP/readme.txt @@ -1,6 +1,6 @@ How to build aMule with GeoIP support -The MaxMind GeoIP library can detect the country an IP adress comes from. aMule uses this information +The MaxMind GeoIP library can detect the country an IP address comes from. aMule uses this information to display a little country flag for each source or ed2k server. Since this is an external library it is disabled by default. This is how to enable it: diff --git a/platforms/Windows/MSVC12/libs/libGeoIP/readme.txt b/platforms/Windows/MSVC12/libs/libGeoIP/readme.txt index 47fc2f66b0..e62e40a8b6 100644 --- a/platforms/Windows/MSVC12/libs/libGeoIP/readme.txt +++ b/platforms/Windows/MSVC12/libs/libGeoIP/readme.txt @@ -1,6 +1,6 @@ How to build aMule with GeoIP support -The MaxMind GeoIP library can detect the country an IP adress comes from. aMule uses this information +The MaxMind GeoIP library can detect the country an IP address comes from. aMule uses this information to display a little country flag for each source or ed2k server. Since this is an external library it is disabled by default. This is how to enable it: diff --git a/src/BarShader.cpp b/src/BarShader.cpp index c6f8889c0f..4855191dbd 100644 --- a/src/BarShader.cpp +++ b/src/BarShader.cpp @@ -61,7 +61,7 @@ void CBarShader::SetHeight(unsigned height) if( m_Height != height ) { m_Height = height; - // Reset the modifers + // Reset the modifiers if ( m_Modifiers ) { delete[] m_Modifiers; m_Modifiers = NULL; @@ -90,7 +90,7 @@ void CBarShader::Set3dDepth(unsigned depth) if ( m_used3dlevel != depth ) { m_used3dlevel = depth; - // Reset the modifers + // Reset the modifiers if ( m_Modifiers ) { delete[] m_Modifiers; m_Modifiers = NULL; diff --git a/src/BarShader.h b/src/BarShader.h index da8bd0844b..f48f7d101e 100644 --- a/src/BarShader.h +++ b/src/BarShader.h @@ -102,7 +102,7 @@ class CBarShader * @param colour The colour of the new span. * * Calling this function fill the specified range with the specified color. - * Any spans completly or partially covered by the new span are either + * Any spans completely or partially covered by the new span are either * removed or resized. If the value of end is larger than the current * filesize, the filesize is increased to the value of end. */ @@ -120,7 +120,7 @@ class CBarShader } /** - * Draws the bar on the specifed wxDC. + * Draws the bar on the specified wxDC. * * @param dc The wxDC upon which the bar should be drawn. * @param iLeft The left position from where to start drawing. @@ -128,7 +128,7 @@ class CBarShader * @param bFlat 3D effect is not applied if this is true. * * This functions draws the bar with the height and width specified - * through either the contructor or with SetWidth() and SetHeight(). + * through either the constructor or with SetWidth() and SetHeight(). */ void Draw( wxDC* dc, int iLeft, int iTop, bool bFlat ); @@ -142,9 +142,9 @@ class CBarShader unsigned m_Width; //! The height of the drawn bar unsigned m_Height; - //! The virtual filesize assosiated with the bar + //! The virtual filesize associated with the bar uint64 m_FileSize; - //! Pointer to array of modifers used to create 3D effect. Size is (m_Height+1)/2 when set. + //! Pointer to array of modifiers used to create 3D effect. Size is (m_Height+1)/2 when set. double* m_Modifiers; //! The current 3d level uint16 m_used3dlevel; diff --git a/src/BaseClient.cpp b/src/BaseClient.cpp index 0364636df5..2fac02df0c 100644 --- a/src/BaseClient.cpp +++ b/src/BaseClient.cpp @@ -127,7 +127,7 @@ CUpDownClient::CUpDownClient(uint16 in_port, uint32 in_userid, uint32 in_serveri } else { m_nConnectIP = wxUINT32_SWAP_ALWAYS(in_userid); } - // Will be on right endianess now + // Will be on right endianness now m_FullUserIP = m_nConnectIP; } @@ -1299,8 +1299,8 @@ bool CUpDownClient::Disconnected(const wxString& DEBUG_ONLY(strReason), bool bFr CAICHHashSet::ClientAICHRequestFailed(this); } - // The remote client does not have to answer with OP_HASHSETANSWER *immediatly* - // after we've sent OP_HASHSETREQUEST. It may occure that a (buggy) remote client + // The remote client does not have to answer with OP_HASHSETANSWER *immediately* + // after we've sent OP_HASHSETREQUEST. It may occur that a (buggy) remote client // is sending use another OP_FILESTATUS which would let us change to DL-state to DS_ONQUEUE. if (((GetDownloadState() == DS_REQHASHSET) || m_fHashsetRequesting) && (m_reqfile)) { m_reqfile->SetHashSetNeeded(true); @@ -1422,7 +1422,7 @@ bool CUpDownClient::TryToConnect(bool bIgnoreMaxCon) } if (uClientIP) { - // Although we filter all received IPs (server sources, source exchange) and all incomming connection attempts, + // Although we filter all received IPs (server sources, source exchange) and all incoming connection attempts, // we do have to filter outgoing connection attempts here too, because we may have updated the ip filter list if (theApp->ipfilter->IsFiltered(uClientIP)) { AddDebugLogLineN(logIPFilter, CFormat(wxT("Filtered ip %u (%s) on TryToConnect\n")) % uClientIP % Uint32toStringIP(uClientIP)); @@ -2145,7 +2145,7 @@ void CUpDownClient::ProcessPublicKeyPacket(const uint8_t* pachPacket, uint32 nSi } if (!theApp->CryptoAvailable()) return; - // the function will handle everything (mulitple key etc) + // the function will handle everything (multiple key etc) if (credits->SetSecureIdent(pachPacket+1, pachPacket[0])){ // if this client wants a signature, now we can send him one if (m_SecureIdentState == IS_SIGNATURENEEDED){ @@ -2200,7 +2200,7 @@ void CUpDownClient::ProcessSignaturePacket(const uint8_t* pachPacket, uint32 nSi AddDebugLogLineN( logClient, wxT("received signature for client without public key") ); return; } - // and one more check: did we ask for a signature and sent a challange packet? + // and one more check: did we ask for a signature and sent a challenge packet? if (credits->m_dwCryptRndChallengeFor == 0){ AddDebugLogLineN( logClient, wxT("received signature for client with invalid challenge value - User ") + GetUserName() ); return; @@ -2487,7 +2487,7 @@ bool CUpDownClient::SendChatMessage(const wxString& message) if (GetChatCaptchaState() == CA_CAPTCHARECV) { m_nChatCaptchaState = CA_SOLUTIONSENT; } else if (GetChatCaptchaState() == CA_SOLUTIONSENT) { - wxFAIL; // we responsed to a captcha but didn't heard from the client afterwards - hopefully its just lag and this message will get through + wxFAIL; // we responded to a captcha but didn't hear from the client afterwards - hopefully it's just lag and this message will get through } else { m_nChatCaptchaState = CA_ACCEPTING; } diff --git a/src/CFile.cpp b/src/CFile.cpp index c2155aa8bd..91085b42dd 100644 --- a/src/CFile.cpp +++ b/src/CFile.cpp @@ -271,7 +271,7 @@ bool CFile::Open(const CPath& fileName, OpenMode mode, int accessMode) m_fd = _wopen(m_filePath.GetRaw().c_str(), flags, accessMode); #else Unicode2CharBuf tmpFileName = filename2char(m_filePath.GetRaw()); - wxASSERT_MSG(tmpFileName, wxT("Convertion failed in CFile::Open")); + wxASSERT_MSG(tmpFileName, wxT("Conversion failed in CFile::Open")); m_fd = open(tmpFileName, flags, accessMode); #endif syscall_check(m_fd != fd_invalid, m_filePath, wxT("opening file")); diff --git a/src/CFile.h b/src/CFile.h index 77459772db..8e2ecfca45 100644 --- a/src/CFile.h +++ b/src/CFile.h @@ -107,7 +107,7 @@ class CFile : public CFileDataIO void Reopen(OpenMode mode); /** - * Calling Create is equivilant of calling open with OpenMode 'write'. + * Calling Create is equivalent of calling open with OpenMode 'write'. * * @param overwrite Specifies if the target file should be overwritten, * in case that it already exists. @@ -127,7 +127,7 @@ class CFile : public CFileDataIO /** - * Returns the file descriptior assosiated with the file. + * Returns the file descriptor associated with the file. * * Note that direct manipulation of the descriptor should * be avoided! That's what this class is for. diff --git a/src/CatDialog.h b/src/CatDialog.h index 1e155e4806..90120d6592 100644 --- a/src/CatDialog.h +++ b/src/CatDialog.h @@ -39,7 +39,7 @@ class wxBitmap; * the user can add or change them. * * It is a self-contained entity, and does not rely on the categories staying - * the same while the dialog is visble, though it will overwrite any changes + * the same while the dialog is visible, though it will overwrite any changes * made to the selected category in the mean time. Also, if the selected category * has been deleted then it will simply be readded. * @@ -83,7 +83,7 @@ class CCatDialog : public wxDialog /** - * Event-handler for selecting incomming dir. + * Event-handler for selecting incoming dir. */ void OnBnClickedBrowse(wxCommandEvent& evt); diff --git a/src/ChatSelector.cpp b/src/ChatSelector.cpp index ff6935d46e..813c2bb1ab 100644 --- a/src/ChatSelector.cpp +++ b/src/ChatSelector.cpp @@ -189,7 +189,7 @@ bool CChatSelector::ProcessMessage(uint64 sender_id, const wxString& message) bool newtab = !session; if ( !session ) { - // This must be a mesage from a client that is not already chatting + // This must be a message from a client that is not already chatting if (client_name.IsEmpty()) { // Core did not send us the name. // This must NOT happen. @@ -310,7 +310,7 @@ void CChatSelector::EndSession(uint64 client_id) } -// Refresh the tab assosiated with a client +// Refresh the tab associated with a client void CChatSelector::RefreshFriend(uint64 toupdate_id, const wxString& new_name) { wxASSERT( toupdate_id ); diff --git a/src/ChatSelector.h b/src/ChatSelector.h index 8d816d66cf..7700e089e1 100644 --- a/src/ChatSelector.h +++ b/src/ChatSelector.h @@ -55,7 +55,7 @@ class CChatSession : public CMuleTextCtrl * * If newline is false, then no newlines will be at the end of added text, * even if the passed string ends with newlines. Multiline strings are - * broken into indivudual lines and each are timestamped with the same date. + * broken into individual lines and each are timestamped with the same date. */ void AddText( const wxString& text, const wxTextAttr& style, bool newline = true ); }; diff --git a/src/ChatWnd.h b/src/ChatWnd.h index a59f5f3ef9..c1da19d4e5 100644 --- a/src/ChatWnd.h +++ b/src/ChatWnd.h @@ -61,22 +61,22 @@ class CChatWnd : public wxPanel */ void OnNMRclickChatTab(wxMouseEvent& evt); /** - * Event-handler fo the Close item on the popup-menu. + * Event-handler of the Close item on the popup-menu. */ void OnPopupClose(wxCommandEvent& evt); /** - * Event-handler fo the CloseAll item on the popup-menu. + * Event-handler of the CloseAll item on the popup-menu. */ void OnPopupCloseAll(wxCommandEvent& evt); /** - * Event-handler fo the CloseOthers item on the popup-menu. + * Event-handler of the CloseOthers item on the popup-menu. */ void OnPopupCloseOthers(wxCommandEvent& evt); /** - * Event-handler fo the AddFriend item on the popup-menu. + * Event-handler of the AddFriend item on the popup-menu. */ void OnAddFriend(wxCommandEvent& evt); diff --git a/src/ClientCreditsList.cpp b/src/ClientCreditsList.cpp index b02e1625f2..f51dee9cf2 100644 --- a/src/ClientCreditsList.cpp +++ b/src/ClientCreditsList.cpp @@ -184,7 +184,7 @@ void CClientCreditsList::SaveList() uint32 count = 0; file.WriteUInt8( CREDITFILE_VERSION ); - // Temporary place-holder for number of stucts + // Temporary place-holder for number of structs file.WriteUInt32( 0 ); ClientMap::iterator it = m_mapClients.begin(); @@ -392,7 +392,7 @@ bool CClientCreditsList::VerifyIdent(CClientCredits* pTarget, const uint8_t* pac wxASSERT ( challenge != 0 ); PokeUInt32(abyBuffer+m_nMyPublicKeyLen, challenge); - // v2 security improvments (not supported by 29b, not used as default by 29c) + // v2 security improvements (not supported by 29b, not used as default by 29c) uint8 nChIpSize = 0; if (byChaIPKind != 0){ nChIpSize = 5; diff --git a/src/ClientList.cpp b/src/ClientList.cpp index 9b8b7ec6a4..a7d49269ee 100644 --- a/src/ClientList.cpp +++ b/src/ClientList.cpp @@ -110,7 +110,7 @@ void CClientList::AddClient( CUpDownClient* toadd ) //Notify_ClientCtrlAddClient( toadd ); - // We always add the ID/ptr pair, regardles of the actual ID value + // We always add the ID/ptr pair, regardless of the actual ID value m_clientList.insert( IDMapPair( toadd->GetUserIDHybrid(), CCLIENTREF(toadd, wxT("CClientList::AddClient m_clientList.insert"))) ); // We only add the IP if it is valid @@ -976,7 +976,7 @@ void CClientList::CleanUpClientList() { // We remove clients which are not needed any more by time // this check is also done on CUpDownClient::Disconnected, however it will not catch all - // cases (if a client changes the state without beeing connected + // cases (if a client changes the state without being connected // // Adding this check directly to every point where any state changes would be more effective, // is however not compatible with the current code, because there are points where a client has diff --git a/src/ClientList.h b/src/ClientList.h index fc246ff988..f4c5621cf6 100644 --- a/src/ClientList.h +++ b/src/ClientList.h @@ -95,7 +95,7 @@ class CClientList * Updates the recorded IP of the specified client. * * @param client The client to have its entry updated. - * @param newIP The new IP adress of the client. + * @param newIP The new IP address of the client. * * This function is to be called before the client actually changes its * IP-address, and will update the old entry with the new value. There @@ -145,7 +145,7 @@ class CClientList * Replaces a new client-instance with the an already existing client, if one such exist. * * @param client A pointer to the pointer of the new instance. - * @param sender The socket assosiated with the new instance. + * @param sender The socket associated with the new instance. * * Call this function when a new client-instance has been created. This function will then * compare it against all existing clients and see if we already have an instance matching @@ -202,7 +202,7 @@ class CClientList * Returns the number of tracked client. * * @param dwIP The IP-adress which of the clients. - * @return The number of clients tracked at the specifed IP. + * @return The number of clients tracked at the specified IP. */ uint16 GetClientsFromIP(uint32 dwIP); @@ -211,7 +211,7 @@ class CClientList * * @param dwIP The IP of the client. * @param nPort The port of the client. - * @param pNewHash The userhash assosiated with the client. + * @param pNewHash The userhash associated with the client. * */ bool ComparePriorUserhash( uint32 dwIP, uint16 nPort, void* pNewHash ); diff --git a/src/ClientRef.cpp b/src/ClientRef.cpp index afd8d4a1ea..df4f714951 100644 --- a/src/ClientRef.cpp +++ b/src/ClientRef.cpp @@ -24,7 +24,7 @@ // #include "ClientRef.h" -#include "amule.h" // Needed fot theApp +#include "amule.h" // Needed for theApp #ifdef CLIENT_GUI #include "UpDownClientEC.h" // Needed for CUpDownClient diff --git a/src/ClientTCPSocket.cpp b/src/ClientTCPSocket.cpp index 90e781daee..a2642a8b77 100644 --- a/src/ClientTCPSocket.cpp +++ b/src/ClientTCPSocket.cpp @@ -34,7 +34,7 @@ #include "Preferences.h" // Needed for thePrefs #include "Packet.h" // Needed for CPacket #include "Statistics.h" // Needed for theStats -#include "Logger.h" // Neeed for logRemoteClient +#include "Logger.h" // Needed for logRemoteClient #include "updownclient.h" // Needed for CUpDownClient #include // Needed for CFormat #include "amule.h" // Needed for theApp @@ -260,7 +260,7 @@ void CClientTCPSocket::Disconnect(const wxString& strReason) byConnected = ES_DISCONNECTED; if (m_client) { if (m_client->Disconnected(strReason, true)) { - // Somehow, Safe_Delete() is beeing called by Disconnected(), + // Somehow, Safe_Delete() is being called by Disconnected(), // or any other function that sets m_client to NULL, // so we must check m_client first. if (m_client) { @@ -340,7 +340,7 @@ bool CClientTCPSocket::ProcessPacket(const uint8_t* buffer, uint32 size, uint8 o theStats::AddDownOverheadOther(size); bool bNewClient = !m_client; if (bNewClient) { - // create new client to save standart informations + // create new client to save standard information m_client = new CUpDownClient(this); } @@ -368,7 +368,7 @@ bool CClientTCPSocket::ProcessPacket(const uint8_t* buffer, uint32 size, uint8 o m_client->Safe_Delete(); m_client = NULL; } - Disconnect(wxT("Paranoid disconecting: ") + reason); + Disconnect(wxT("Paranoid disconnecting: ") + reason); return false; } @@ -389,14 +389,14 @@ bool CClientTCPSocket::ProcessPacket(const uint8_t* buffer, uint32 size, uint8 o // and the var. "client" will point to the known client. // if not we keep our new-constructed client ;) if (theApp->clientlist->AttachToAlreadyKnown(&m_client,this)) { - // update the old client informations + // update the old client information bIsMuleHello = m_client->ProcessHelloPacket(buffer, size); } else { theApp->clientlist->AddClient(m_client); m_client->SetCommentDirty(); } Notify_SharedCtrlRefreshClient( m_client->ECID(), AVAILABLE_SOURCE ); - // send a response packet with standart informations + // send a response packet with standard information if ((m_client->GetHashType() == SO_EMULE) && !bIsMuleHello) { m_client->SendMuleInfoPacket(false); } @@ -1023,7 +1023,7 @@ bool CClientTCPSocket::ProcessExtPacket(const uint8_t* buffer, uint32 size, uint DumpMem(buffer,size); #endif - // 0.42e - except the catchs on mem exception and file exception + // 0.42e - except the catches on mem exception and file exception if (!m_client) { throw wxString(wxT("Unknown clients sends extended protocol packet")); } @@ -1934,7 +1934,7 @@ void CClientTCPSocket::OnError(int nErrorCode) } } else { if (theLogger.IsEnabled(logClient) && nErrorCode != 107) { - // 0 -> No Error / Disconect + // 0 -> No Error / Disconnect // 107 -> Transport endpoint is not connected if (m_client) { if (!m_client->GetUserName().IsEmpty()) { diff --git a/src/DeadSourceList.h b/src/DeadSourceList.h index a2c803d174..c9d98db1a6 100644 --- a/src/DeadSourceList.h +++ b/src/DeadSourceList.h @@ -39,9 +39,9 @@ class CUpDownClient; * This class keeps track of "invalid" sources. * * A dead source is a source that has been evaluated as being useles - * which can be due to serveral reasons, such as not responding to + * which can be due to several reasons, such as not responding to * queries. This list then allows for those sources to be ignored - * for an set ammount of time in order to avoid the overhead of + * for an set amount of time in order to avoid the overhead of * trying to connect to them. * * This is important, since these sources would be removed and readded diff --git a/src/DirectoryTreeCtrl.cpp b/src/DirectoryTreeCtrl.cpp index 1e7486e872..714cbdd278 100644 --- a/src/DirectoryTreeCtrl.cpp +++ b/src/DirectoryTreeCtrl.cpp @@ -114,7 +114,7 @@ void CDirectoryTreeCtrl::Init() drives >>= 1; for (char drive = 'C'; drive <= 'Z'; drive++) { drives >>= 1; - if (! (drives & 1)) { // skip non existant drives + if (! (drives & 1)) { // skip non existent drives continue; } wxString driveStr = CFormat(wxT("%c:")) % drive; diff --git a/src/DownloadClient.cpp b/src/DownloadClient.cpp index 37f81a86ec..30248acb6b 100644 --- a/src/DownloadClient.cpp +++ b/src/DownloadClient.cpp @@ -902,7 +902,7 @@ void CUpDownClient::ProcessBlockPacket(const uint8_t* packet, uint32 size, bool // Found reserved block if (cur_block->block->StartOffset == nStartPos) { - // This block just started transfering. Set the start time. + // This block just started transferring. Set the start time. m_last_block_start = ::GetTickCountFullRes(); } @@ -1155,7 +1155,7 @@ int CUpDownClient::unzip(Pending_Block_Struct *block, uint8_t *zipped, uint32 le // Speed is now updated only when data was received, calculated as -// (data received) / (time since last receiption) +// (data received) / (time since last reception) // and slightly filtered (10s average). // Result is quite precise now and makes the DownloadRateAdjust workaround obsolete. @@ -1403,7 +1403,7 @@ uint8 CUpDownClient::GetObfuscationStatus() const return ret; } -// IgnoreNoNeeded = will switch to files of which this source has no needed parts (if no better fiels found) +// IgnoreNoNeeded = will switch to files of which this source has no needed parts (if no better files found) // ignoreSuspensions = ignore timelimit for A4Af jumping // bRemoveCompletely = do not readd the file which the source is swapped from to the A4AF lists (needed if deleting or stopping a file) // toFile = Try to swap to this partfile only @@ -1480,7 +1480,7 @@ bool CUpDownClient::SwapToAnotherFile(bool bIgnoreNoNeeded, bool ignoreSuspensio m_reqfile->RemoveDownloadingSource( this ); - // Do we want to remove it completly? Say if the old file is getting deleted + // Do we want to remove it completely? Say if the old file is getting deleted if ( !bRemoveCompletely ) { m_reqfile->AddA4AFSource( this ); @@ -1624,7 +1624,7 @@ void CUpDownClient::ProcessAICHAnswer(const uint8_t* packet, uint32 size) && ahMasterHash == pPartFile->GetAICHHashset()->GetMasterHash()) { if(pPartFile->GetAICHHashset()->ReadRecoveryData(request.m_nPart*PARTSIZE, &data)){ - // finally all checks passed, everythings seem to be fine + // finally all checks passed, everything seems to be fine AddDebugLogLineN(logAICHTransfer, wxT("AICH Packet Answer: Succeeded to read and validate received recoverydata")); CAICHHashSet::RemoveClientAICHRequest(this); pPartFile->AICHRecoveryDataAvailable(request.m_nPart); @@ -1666,7 +1666,7 @@ void CUpDownClient::ProcessAICHRequest(const uint8_t* packet, uint32 size) pKnownFile->GetAICHHashset()->GetMasterHash().Write(&fileResponse); if (pKnownFile->GetAICHHashset()->CreatePartRecoveryData(nPart*PARTSIZE, &fileResponse)){ AddDebugLogLineN(logAICHTransfer, - CFormat(wxT("AICH Packet Request: Sucessfully created and send recoverydata for '%s' to %s")) + CFormat(wxT("AICH Packet Request: Successfully created and send recoverydata for '%s' to %s")) % pKnownFile->GetFileName() % GetClientFullInfo()); CPacket* packAnswer = new CPacket(fileResponse, OP_EMULEPROT, OP_AICHANSWER); diff --git a/src/DownloadListCtrl.cpp b/src/DownloadListCtrl.cpp index 7cb56dbebf..e89efbc087 100644 --- a/src/DownloadListCtrl.cpp +++ b/src/DownloadListCtrl.cpp @@ -221,7 +221,7 @@ void CDownloadListCtrl::RemoveFile( CPartFile* file ) // Ensure that any list-entries are removed ShowFile( file, false ); - // Find the assosiated list-item + // Find the associated list-item ListItems::iterator it = m_ListItems.find( file ); if ( it != m_ListItems.end() ) { @@ -1132,7 +1132,7 @@ int CDownloadListCtrl::SortProc(wxUIntPtr param1, wxUIntPtr param2, long sortDat int sortMod = (sortData & CMuleListCtrl::SORT_DES) ? -1 : 1; sortData &= CMuleListCtrl::COLUMN_MASK; - // We modify the result so that it matches with ascending or decending + // We modify the result so that it matches with ascending or descending return sortMod * Compare( item1->GetFile(), item2->GetFile(), sortData); } diff --git a/src/DownloadListCtrl.h b/src/DownloadListCtrl.h index 43e16f9546..5ab06567db 100644 --- a/src/DownloadListCtrl.h +++ b/src/DownloadListCtrl.h @@ -86,7 +86,7 @@ class CDownloadListCtrl : public CMuleListCtrl * * @param file A valid pointer of the file to be removed. * - * This function also removes any sources assosiated with the file. + * This function also removes any sources associated with the file. */ void RemoveFile( CPartFile* file ); diff --git a/src/DownloadQueue.cpp b/src/DownloadQueue.cpp index 10bd4cd751..a2d47bf727 100644 --- a/src/DownloadQueue.cpp +++ b/src/DownloadQueue.cpp @@ -408,7 +408,7 @@ bool CDownloadQueue::IsFileExisting( const CMD4Hash& fileid ) const #define RARITY_FACTOR 4 // < 25% #define NORMALITY_FACTOR 2 // <50% -// x > NORMALITY_FACTOR -> High availablity. +// x > NORMALITY_FACTOR -> High availability. void CDownloadQueue::Process() { @@ -448,7 +448,7 @@ void CDownloadQueue::Process() if (status == PS_READY || status == PS_EMPTY ){ cur_datarate += file->Process( downspeed, cur_udcounter ); } else { - //This will make sure we don't keep old sources to paused and stoped files.. + //This will make sure we don't keep old sources to paused and stopped files.. file->StopPausedFile(); } @@ -496,7 +496,7 @@ void CDownloadQueue::Process() } m_rareFileThreshold = (m_sourcecountlist.front() > 0) ? (m_sourcecountlist.front() - 1) : 1; - // 50% of the non-rare ones, with the curent #define values. + // 50% of the non-rare ones, with the current #define values. int commoncutpoint = (nSourceGroups - rarecutpoint) / NORMALITY_FACTOR; for (int i = 0; i < commoncutpoint; ++ i) { m_sourcecountlist.pop_front(); @@ -975,7 +975,7 @@ void CDownloadQueue::DoStopUDPRequests() } -// Comparison function needed by sort. Returns true if file1 preceeds file2 +// Comparison function needed by sort. Returns true if file1 precedes file2 static bool ComparePartFiles(const CPartFile* file1, const CPartFile* file2) { if (file1->GetDownPriority() != file2->GetDownPriority()) { // To place high-priority files before low priority files we have to diff --git a/src/DownloadQueue.h b/src/DownloadQueue.h index 5013bd2002..530a6aa734 100644 --- a/src/DownloadQueue.h +++ b/src/DownloadQueue.h @@ -28,7 +28,7 @@ #include "MD4Hash.h" // Needed for CMD4Hash #include "ObservableQueue.h" // Needed for CObservableQueue -#include "GetTickCount.h" // Needed fot GetTickCount +#include "GetTickCount.h" // Needed for GetTickCount #include @@ -168,7 +168,7 @@ class CDownloadQueue : public CObservableQueue /** * This function adds already known source to the specified file. * - * @param sender The owner fo the new source. + * @param sender The owner of the new source. * @param source The client in question. * * This function acts like CheckAndAddSource, with the exception that no @@ -179,7 +179,7 @@ class CDownloadQueue : public CObservableQueue /** - * Removes the specified client completly. + * Removes the specified client completely. * * @param toremove The client to be removed. * @param updatewindow NOT USED! @@ -346,7 +346,7 @@ class CDownloadQueue : public CObservableQueue void AddToResolve(const CMD4Hash& fileid, const wxString& pszHostname, uint16 port, const wxString& hash, uint8 cryptoptions); - //! The mutex assosiated with this class, mutable to allow for const functions. + //! The mutex associated with this class, mutable to allow for const functions. mutable wxMutex m_mutex; diff --git a/src/EMSocket.cpp b/src/EMSocket.cpp index e3e45a0e87..14743c354c 100644 --- a/src/EMSocket.cpp +++ b/src/EMSocket.cpp @@ -662,7 +662,7 @@ uint32 CEMSocket::GetNeededBytes() } if (!((sendbuffer && !m_currentPacket_is_controlpacket) || !m_standard_queue.empty())) { - // No standard packet to send. Even if data needs to be sent to prevent timout, there's nothing to send. + // No standard packet to send. Even if data needs to be sent to prevent timeout, there's nothing to send. return 0; } diff --git a/src/EncryptedStreamSocket.cpp b/src/EncryptedStreamSocket.cpp index 670e37afee..66ab5afc99 100644 --- a/src/EncryptedStreamSocket.cpp +++ b/src/EncryptedStreamSocket.cpp @@ -51,7 +51,7 @@ would be used and RC4 would create the same output. Since the key is a MD5 hash it doesn't weaken the key if that part is known - Why DH-KeyAgreement isn't used as basic obfuscation key: It doesn't offer substantial more protection against passive connection based protocol identification, it has about 200 bytes more overhead, needs more CPU time, we cannot say if the received data is junk, unencrypted or part of the keyagreement before the handshake is finished without losing the complete randomness, - it doesn't offer substantial protection against eavesdropping without added authentification + it doesn't offer substantial protection against eavesdropping without added authentication Basic Obfuscated Handshake Protocol Client <-> Server: - RC4 Keycreation: @@ -506,7 +506,7 @@ int CEncryptedStreamSocket::Negotiate(const uint8* pBuffer, uint32 nLen) m_nReceiveBytesWanted = 3; } else { //printf("Wrong magic value: 0x%x != 0x%x on %s\n",dwValue, MAGICVALUE_SYNC, (const char*)unicode2char(GetPeer())); - //DebugLogError(_T("CEncryptedStreamSocket: Received wrong magic value from clientIP %s on a supposly encrytped stream / Wrong Header"), GetPeer()); + //DebugLogError(_T("CEncryptedStreamSocket: Received wrong magic value from clientIP %s on a supposly encrypted stream / Wrong Header"), GetPeer()); OnError(ERR_ENCRYPTION); return (-1); } @@ -522,7 +522,7 @@ int CEncryptedStreamSocket::Negotiate(const uint8* pBuffer, uint32 nLen) if (m_dbgbyEncryptionRequested != ENM_OBFUSCATION) { //printf("Unsupported encryption method!\n"); -// AddDebugLogLine(DLP_LOW, false, _T("CEncryptedStreamSocket: Client %s preffered unsupported encryption method (%i)"), GetPeer(), m_dbgbyEncryptionRequested); +// AddDebugLogLine(DLP_LOW, false, _T("CEncryptedStreamSocket: Client %s preferred unsupported encryption method (%i)"), GetPeer(), m_dbgbyEncryptionRequested); } m_nReceiveBytesWanted = m_pfiReceiveBuffer.ReadUInt8(); @@ -632,7 +632,7 @@ int CEncryptedStreamSocket::Negotiate(const uint8* pBuffer, uint32 nLen) m_dbgbyEncryptionSupported = m_pfiReceiveBuffer.ReadUInt8(); m_dbgbyEncryptionRequested = m_pfiReceiveBuffer.ReadUInt8(); if (m_dbgbyEncryptionRequested != ENM_OBFUSCATION) { - // AddDebugLogLine(DLP_LOW, false, _T("CEncryptedStreamSocket: Server %s preffered unsupported encryption method (%i)"), GetPeer(), m_dbgbyEncryptionRequested); + // AddDebugLogLine(DLP_LOW, false, _T("CEncryptedStreamSocket: Server %s preferred unsupported encryption method (%i)"), GetPeer(), m_dbgbyEncryptionRequested); } m_nReceiveBytesWanted = m_pfiReceiveBuffer.ReadUInt8(); m_NegotiatingState = ONS_BASIC_SERVER_PADDING; diff --git a/src/ExternalConn.cpp b/src/ExternalConn.cpp index 4b5bd4d22b..d44ffa010d 100644 --- a/src/ExternalConn.cpp +++ b/src/ExternalConn.cpp @@ -1668,7 +1668,7 @@ CECPacket *CECServerSocket::ProcessRequest2(const CECPacket *request) case EC_OP_DELETE_CATEGORY: if ( request->GetTagCount() == 1 ) { uint32 cat = request->GetFirstTagSafe()->GetInt(); - // this noes not only update the gui, but actually deletes the cat + // this does not only update the gui, but actually deletes the cat Notify_CategoryDelete(cat); } response = new CECPacket(EC_OP_NOOP); diff --git a/src/FileArea.cpp b/src/FileArea.cpp index ab2b46fa88..2851079464 100644 --- a/src/FileArea.cpp +++ b/src/FileArea.cpp @@ -140,7 +140,7 @@ void CFileAreaSigHandler::Init() return; // Set our new signal handler. - // Note that we safe old handlers (propably wx ones) in order + // Note that we safe old handlers (probably wx ones) in order // to be able to call them if signal not handled as desired. // These handler will be removed by wx code when wx will restore // old ones diff --git a/src/FileArea.h b/src/FileArea.h index 17c6dee91a..bc17e70e53 100644 --- a/src/FileArea.h +++ b/src/FileArea.h @@ -75,7 +75,7 @@ friend class CFileAreaSigHandler; bool FlushAt(CFileAutoClose& file, uint64 offset, size_t count); /** - * Get buffer that contains data readed or to write. + * Get buffer that contains data read or to write. * @return allocated buffer or NULL if not initialized */ uint8_t *GetBuffer() const { return m_buffer; }; diff --git a/src/FileAutoClose.h b/src/FileAutoClose.h index a0312f71c6..69eefbfc23 100644 --- a/src/FileAutoClose.h +++ b/src/FileAutoClose.h @@ -70,7 +70,7 @@ class CFileAutoClose bool Open(const CPath& path, CFile::OpenMode mode = CFile::read); /** - * Calling Create is equivilant of calling open with OpenMode 'write'. + * Calling Create is equivalent of calling open with OpenMode 'write'. * * @param overwrite Specifies if the target file should be overwritten, * in case that it already exists. @@ -140,7 +140,7 @@ class CFileAutoClose bool Eof(); /** - * Returns the file descriptior assosiated with the file. + * Returns the file descriptor associated with the file. * * This breaks the purpose of this class of course. * Therefore the AutoClose mechanism is disabled when fd() is called. diff --git a/src/FileDetailListCtrl.cpp b/src/FileDetailListCtrl.cpp index b4e9d5d2e2..19c1a7dc33 100644 --- a/src/FileDetailListCtrl.cpp +++ b/src/FileDetailListCtrl.cpp @@ -65,7 +65,7 @@ int CFileDetailListCtrl::SortProc(wxUIntPtr param1, wxUIntPtr param2, long sortD void CFileDetailListCtrl::OnSelect(wxListEvent& event) { - // Damn wxLC_SINGLE_SEL does not work! So we have to care for single selection ourselfs: + // Damn wxLC_SINGLE_SEL does not work! So we have to care for single selection ourselves: long realpos = event.m_itemIndex; long pos = -1; do { diff --git a/src/FileLock.h b/src/FileLock.h index 9758bdd863..ed5b7a1298 100644 --- a/src/FileLock.h +++ b/src/FileLock.h @@ -106,10 +106,10 @@ class CFileLock } - //! Desriptor of the file being locked. + //! Descriptor of the file being locked. HANDLE hd; - //! Specifies if the file-lock was aquired. + //! Specifies if the file-lock was acquired. bool m_ok; #else : m_fd(-1), @@ -166,7 +166,7 @@ class CFileLock //! Desribtor of the file being locked. int m_fd; - //! Specifies if the file-lock was aquired. + //! Specifies if the file-lock was acquired. bool m_ok; #endif }; diff --git a/src/GapList.cpp b/src/GapList.cpp index f35b0f5942..861ef607d8 100644 --- a/src/GapList.cpp +++ b/src/GapList.cpp @@ -152,7 +152,7 @@ void CGapList::FillGap(uint64 partstart, uint64 partend) if (curGapStart >= partstart) { if (curGapEnd <= partend) { - // our part fills this gap completly + // our part fills this gap completely m_gaplist.erase(it2); } else if (curGapStart <= partend) { // lower part of this gap is in the part - shrink gap: diff --git a/src/GenericClientListCtrl.cpp b/src/GenericClientListCtrl.cpp index 963e1d5ec3..b931191da1 100644 --- a/src/GenericClientListCtrl.cpp +++ b/src/GenericClientListCtrl.cpp @@ -457,7 +457,7 @@ void CGenericClientListCtrl::ShowSources( const CKnownFileVector& files ) * Helper-function: This function is used to gather selected items. * * @param list A pointer to the list to gather items from. - * @return A list containing the selected items of the choosen types. + * @return A list containing the selected items of the chosen types. */ static ItemList GetSelectedItems( CGenericClientListCtrl* list ) { @@ -1113,8 +1113,8 @@ int CGenericClientListCtrl::SortProc(wxUIntPtr param1, wxUIntPtr param2, long so sortData &= CMuleListCtrl::COLUMN_MASK; int comp = 0; - // Two sources, some different possibilites - // Avilable sources first, if we have both an + // Two sources, some different possibilities + // Available sources first, if we have both an // available and an unavailable comp = ( item2->GetType() - item1->GetType() ); @@ -1125,7 +1125,7 @@ int CGenericClientListCtrl::SortProc(wxUIntPtr param1, wxUIntPtr param2, long so comp = Compare(item1->GetSource(), item2->GetSource(), sortData); } - // We modify the result so that it matches with ascending or decending + // We modify the result so that it matches with ascending or descending return sortMod * comp; } diff --git a/src/GenericClientListCtrl.h b/src/GenericClientListCtrl.h index b5a918b046..f8a7e885e0 100644 --- a/src/GenericClientListCtrl.h +++ b/src/GenericClientListCtrl.h @@ -158,7 +158,7 @@ class CGenericClientListCtrl : public CMuleListCtrl private: /** * - * Must be overriden by the derived class and return the dialog where this list is. + * Must be overridden by the derived class and return the dialog where this list is. * @see CamuleDlg::DialogType * */ diff --git a/src/GuiEvents.h b/src/GuiEvents.h index 625472a6eb..872a75d49c 100644 --- a/src/GuiEvents.h +++ b/src/GuiEvents.h @@ -50,7 +50,7 @@ DECLARE_LOCAL_EVENT_TYPE(MULE_EVT_NOTIFY, -1) /** * This namespaces contains a number of functions and classes - * related to defered function calls, allowing a notification + * related to deferred function calls, allowing a notification * call to be delayed till it can be initiated from the main * thread. */ @@ -386,7 +386,7 @@ namespace MuleNotify /** * This function will execute or queue a given notification functor. * - * If the caller is the main thread, the functor is executed immediatly, + * If the caller is the main thread, the functor is executed immediately, * thus acting like a regular function call. OTOH, if the caller is a * worker thread, the functor is cloned and sent via an event to * wxTheApp. @@ -396,7 +396,7 @@ namespace MuleNotify /** * These functions take a function pointer and a set of arguments, * matching those of the function-pointer. A functor is created - * from these and either executed immediatly, or sent as an event + * from these and either executed immediately, or sent as an event * in the case of non-main threads calling the functions. * * Note that the return-value of the function must be void. diff --git a/src/HTTPDownload.cpp b/src/HTTPDownload.cpp index 11df0565c7..7828931bc2 100644 --- a/src/HTTPDownload.cpp +++ b/src/HTTPDownload.cpp @@ -273,14 +273,14 @@ CMuleThread::ExitCode CHTTPDownloadThread::Entry() if (current_read == 0) { if (download_size == -1) { - // Download was probably succesful. + // Download was probably successful. AddLogLineN(CFormat(_("Downloaded %d bytes")) % total_read); m_result = HTTP_Success; } else if (total_read != download_size) { m_result = HTTP_Error; throw wxString(CFormat(_("Expected %d bytes, but downloaded %d bytes")) % download_size % total_read); } else { - // Download was succesful. + // Download was successful. m_result = HTTP_Success; } } @@ -346,7 +346,7 @@ wxInputStream* CHTTPDownloadThread::GetInputStream(wxHTTP * & url_handler, const // Remove the "http://" wxString host = location.Right(location.Len() - 7); // strlen("http://") -> 7 - // I belive this is a bug... + // I believe this is a bug... // Sometimes "Location" header looks like this: // "http://www.whatever.com:8080http://www.whatever.com/downloads/something.zip" // So let's clean it... diff --git a/src/IPFilter.cpp b/src/IPFilter.cpp index 3ac9cca552..ce6b0c7ccf 100644 --- a/src/IPFilter.cpp +++ b/src/IPFilter.cpp @@ -240,7 +240,7 @@ class CIPFilterTask : public CThreadTask * @param IPstart The start of the IP-range. * @param IPend The end of the IP-range, must be less than or equal to IPstart. * @param AccessLevel The AccessLevel of this range. - * @param Description The assosiated description of this range. + * @param Description The associated description of this range. * @return true if the range was added, false if it was discarded. * * This function inserts the specified range into the IPMap. Invalid @@ -388,7 +388,7 @@ CIPFilter::CIPFilter() : << wxT("# This file is used to store ipfilter-ranges that should\n") << wxT("# not be overwritten by aMule. If you wish to keep a custom\n") << wxT("# set of ipfilter-ranges that take precedence over ipfilter-\n") - << wxT("# ranges aquired through the auto-update functionality, then\n") + << wxT("# ranges acquired through the auto-update functionality, then\n") << wxT("# place them in this file. aMule will not change this file."); CreateDummyFile(staticDat, staticMsg); diff --git a/src/KadDlg.cpp b/src/KadDlg.cpp index ae65cf2b43..7e37b1665a 100644 --- a/src/KadDlg.cpp +++ b/src/KadDlg.cpp @@ -153,7 +153,7 @@ void CKadDlg::UpdateNodeCount(unsigned nodeCount) } -// Enables or disables the node connect button depending on the conents of the text fields +// Enables or disables the node connect button depending on the contents of the text fields void CKadDlg::OnFieldsChange(wxCommandEvent& WXUNUSED(evt)) { // These are the IDs of the search-fields diff --git a/src/KnownFile.cpp b/src/KnownFile.cpp index 76953f5a7c..5c616d1904 100644 --- a/src/KnownFile.cpp +++ b/src/KnownFile.cpp @@ -633,7 +633,7 @@ bool CKnownFile::LoadTagsFromFile(const CFileDataIO* file) SetLastPublishTimeKadSrc( newtag.GetInt(), 0 ); if(GetLastPublishTimeKadSrc() > (uint32)time(NULL)+KADEMLIAREPUBLISHTIMES) { - //There may be a posibility of an older client that saved a random number here.. This will check for that.. + //There may be a possibility of an older client that saved a random number here.. This will check for that.. SetLastPublishTimeKadSrc(0, 0); } break; @@ -695,7 +695,7 @@ bool CKnownFile::WriteToFile(CFileDataIO* file) tagcount++; } // Float meta tags are currently not written. All older eMule versions < 0.28a have - // a bug in the meta tag reading+writing code. To achive maximum backward + // a bug in the meta tag reading+writing code. To achieve maximum backward // compatibility for met files with older eMule versions we just don't write float // tags. This is OK, because we (eMule) do not use float tags. The only float tags // we may have to handle is the '# Sent' tag from the Hybrid, which is pretty diff --git a/src/KnownFile.h b/src/KnownFile.h index ae78715754..16e93fc14b 100644 --- a/src/KnownFile.h +++ b/src/KnownFile.h @@ -234,7 +234,7 @@ friend class CHashingTask; // KAD TODO: This must be used on KadSearchListCtrl too once imported void SetKadFileSearchID(uint32 id) { kadFileSearchID = id; } // John - Don't use this unless you know what your are DOING!! (Hopefully I do.. :) const Kademlia::WordList& GetKadKeywords() const { return wordlist; } - // KAD TODO: If we add the proper column to SharedFilesCtrl, this is the funtion. + // KAD TODO: If we add the proper column to SharedFilesCtrl, this is the function. uint32 GetLastPublishTimeKadSrc() const { return m_lastPublishTimeKadSrc; } void SetLastPublishTimeKadSrc(uint32 time, uint32 buddyip) { m_lastPublishTimeKadSrc = time; m_lastBuddyIP = buddyip;} // Another unused function, useful for the shared files control column @@ -276,9 +276,9 @@ friend class CHashingTask; bool HasProperAICHHashSet() const; /** - * Updates the requency of uploading parts from with the data the client provides. + * Updates the frequency of uploading parts from with the data the client provides. * - * @param client The clients whoose uploading parts should be considered. + * @param client The clients whose uploading parts should be considered. * @param increment If true, the counts are incremented, otherwise they are decremented. * * This functions updates the frequency list of file-upparts, using the clients diff --git a/src/LibSocket.h b/src/LibSocket.h index a83be86a20..f4c6a2051c 100644 --- a/src/LibSocket.h +++ b/src/LibSocket.h @@ -305,7 +305,7 @@ class CLibSocket : public wxSocketClient m_isDestroying = true; SetNotify(0); Notify(false); - Close(); // Destroy is suposed to call Close(), but.. it doesn't hurt. + Close(); // Destroy is supposed to call Close(), but.. it doesn't hurt. wxSocketClient::Destroy(); } } diff --git a/src/ListenSocket.h b/src/ListenSocket.h index 215bbe3209..efe709b279 100644 --- a/src/ListenSocket.h +++ b/src/ListenSocket.h @@ -30,7 +30,7 @@ #ifndef LISTENSOCKET_H #define LISTENSOCKET_H -#include "Proxy.h" // Needed fot CProxyData, CSocketServerProxy +#include "Proxy.h" // Needed for CProxyData, CSocketServerProxy #include diff --git a/src/Logger.cpp b/src/Logger.cpp index bc14d5bced..af3f17091e 100644 --- a/src/Logger.cpp +++ b/src/Logger.cpp @@ -160,7 +160,7 @@ void CLogger::AddLogLine( CLoggingEvent Event(critical, toStdout, toGUI, msg); AddPendingEvent(Event); } else { - // Try to handle events immediatly when possible (to save to file). + // Try to handle events immediately when possible (to save to file). DoLines(msg, critical, toStdout, toGUI); } } diff --git a/src/Logger.h b/src/Logger.h index 00372a5f8a..2706513e7c 100644 --- a/src/Logger.h +++ b/src/Logger.h @@ -54,7 +54,7 @@ enum DebugType logZLib, //! Warnings/Errors for the AICH-syncronization thread. logAICHThread, - //! Warnings/Errors for transfering AICH hash-sets. + //! Warnings/Errors for transferring AICH hash-sets. logAICHTransfer, //! Warnings/Errors when recovering with AICH. logAICHRecovery, @@ -82,7 +82,7 @@ enum DebugType logSearch, //! Warnings/Errors related to the server UDP socket. logServerUDP, - //! Warning/Errors related to Kademlia UDP comunication on client + //! Warning/Errors related to Kademlia UDP communication on client logClientKadUDP, //! Warning/Errors related to Kademlia Search logKadSearch, diff --git a/src/MD4Hash.h b/src/MD4Hash.h index 4c91449991..127bd73aa8 100644 --- a/src/MD4Hash.h +++ b/src/MD4Hash.h @@ -45,7 +45,7 @@ const size_t MD4HASH_LENGTH = 16; * * This is a safe representation of the MD4 hashes used in aMule. By transparently * wrapping the char array used to store the hash, we get the advantages of - * assigment, equality and non-equality operators, plus other nifty features. + * assignment, equality and non-equality operators, plus other nifty features. * * Please remember that the hashes are arrays with length 16 WITHOUT a zero-terminator! */ @@ -126,7 +126,7 @@ class CMD4Hash * * This functions checks the contents of the hash and returns true * only if each field of the array contains the value zero. - * To achive an empty hash, the function Clear() can be used. + * To achieve an empty hash, the function Clear() can be used. */ bool IsEmpty() const { return ( @@ -151,7 +151,7 @@ class CMD4Hash * Decodes a 32 char long hexadecimal representation of a MD4 hash. * * @param hash The hash representation to be converted. Length must be 32. - * @return Return value specifies if the hash was succesfully decoded. + * @return Return value specifies if the hash was successfully decoded. * * This function converts a hexadecimal representation of a MD4 * hash and stores it in the m_hash data-member. diff --git a/src/MemFile.h b/src/MemFile.h index 894b0bdd0e..e3b04b5606 100644 --- a/src/MemFile.h +++ b/src/MemFile.h @@ -39,7 +39,7 @@ * of the same packet. * - Endian correction is handled transparently. When reading and * writing values, CMemFile converts to and from little-endian, - * so that no explicit endian convertions are nescesarry. + * so that no explicit endian conversions are necessary. * - Strings of dynamic length can be read. * * Most of these advantages also hold for writing packets. @@ -57,7 +57,7 @@ class CMemFile : public CFileDataIO * The growth-rate specified by how much the buffer-size will * be increased when the memfile runs out of space. Normally * this means that the amount of re-allocations is cut down - * at the expence of slightly higher mem-usage. + * at the expense of slightly higher mem-usage. * * If the size of the entire file to be written is known * in advance, one can avoid needless re-allocations by @@ -110,7 +110,7 @@ class CMemFile : public CFileDataIO * If the current position is greater than the new length, it * will be set to the end of the file. * - * Note that changing the lenght of a file with an attached buffer + * Note that changing the length of a file with an attached buffer * to a value greater than the actual buffer size is an illegal * operation. */ diff --git a/src/MuleCollection.cpp b/src/MuleCollection.cpp index 6c36f0b6a6..c56f203994 100644 --- a/src/MuleCollection.cpp +++ b/src/MuleCollection.cpp @@ -10,7 +10,7 @@ // // Marcelo Malheiros // * fixed error with FT_FILEHASH -// * added inital 5 tag/file support +// * added initial 5 tag/file support // // Any parts of this program derived from the xMule, lMule or eMule project, // or contributed by third-party developers are copyrighted by their diff --git a/src/MuleGifCtrl.h b/src/MuleGifCtrl.h index 2399c8cd8c..7e0b63323f 100644 --- a/src/MuleGifCtrl.h +++ b/src/MuleGifCtrl.h @@ -64,7 +64,7 @@ class MuleGifCtrl : public wxControl public: /** - * Contructor. See wxWindow class documentation for more information. + * Constructor. See wxWindow class documentation for more information. */ MuleGifCtrl( wxWindow *parent, wxWindowID id, @@ -107,9 +107,9 @@ class MuleGifCtrl : public wxControl void Stop(); /** - * Returns the prefered size of the widget. + * Returns the preferred size of the widget. * - * @return Prefered size, which is the size of the animation. + * @return Preferred size, which is the size of the animation. */ virtual wxSize GetBestSize(); diff --git a/src/MuleListCtrl.cpp b/src/MuleListCtrl.cpp index a80d8df57d..d2c2b862ca 100644 --- a/src/MuleListCtrl.cpp +++ b/src/MuleListCtrl.cpp @@ -222,7 +222,7 @@ void CMuleListCtrl::LoadSettings() wxString sortOrders = cfg->Read(wxT("/eMule/TableOrdering") + m_name, wxEmptyString); wxString columnWidths = cfg->Read(wxT("/eMule/TableWidths") + m_name, wxEmptyString); - // Prevent sorting from occuring when calling SetSorting + // Prevent sorting from occurring when calling SetSorting MuleListCtrlCompare sortFunc = m_sort_func; m_sort_func = NULL; diff --git a/src/MuleListCtrl.h b/src/MuleListCtrl.h index 9bcfdadbdf..33ee1fbee2 100644 --- a/src/MuleListCtrl.h +++ b/src/MuleListCtrl.h @@ -247,7 +247,7 @@ class CMuleListCtrl : public MuleExtern::wxGenericListCtrl * * By default, this function simply returns the text in the first * column for the given item. However, when owner-drawing is - * enabled, this function _must_ be overriden. + * enabled, this function _must_ be overridden. */ virtual wxString GetTTSText(unsigned item) const; @@ -446,7 +446,7 @@ class CMuleListCtrl : public MuleExtern::wxGenericListCtrl * @param[in] oldindex Old column index which we want to turn into a * new index. * - * @return The new index of the column, or -1 if an error occured. + * @return The new index of the column, or -1 if an error occurred. */ int GetNewColumnIndex(int oldindex) const; diff --git a/src/MuleNotebook.h b/src/MuleNotebook.h index e69322e782..aa1daac34d 100644 --- a/src/MuleNotebook.h +++ b/src/MuleNotebook.h @@ -113,7 +113,7 @@ class CMuleNotebook : public wxNotebook /** * Sets an external widget to handle the popup-event. * - * @param widget The widget which would recieve the event or NULL to disable. + * @param widget The widget which would receive the event or NULL to disable. * * Setting the handler to a non-NULL pointer means that upon right-clicks, a * right click event will be sent to that widget, so that it can create a @@ -145,24 +145,24 @@ class CMuleNotebook : public wxNotebook void OnRMButton(wxMouseEvent& event); /** - * Event-handler fo the Close item on the popup-menu. + * Event-handler of the Close item on the popup-menu. */ void OnPopupClose(wxCommandEvent& evt); /** - * Event-handler fo the CloseAll item on the popup-menu. + * Event-handler of the CloseAll item on the popup-menu. */ void OnPopupCloseAll(wxCommandEvent& evt); /** - * Event-handler fo the CloseOthers item on the popup-menu. + * Event-handler of the CloseOthers item on the popup-menu. */ void OnPopupCloseOthers(wxCommandEvent& evt); //! Keeps track of the popup-menu being enabled or not. bool m_popup_enable; - //! The pointer to the widget which would recieve right-click events or NULL. + //! The pointer to the widget which would receive right-click events or NULL. wxWindow* m_popup_widget; DECLARE_EVENT_TABLE() diff --git a/src/MuleTextCtrl.cpp b/src/MuleTextCtrl.cpp index 3f10ab617d..a68ea3c3de 100644 --- a/src/MuleTextCtrl.cpp +++ b/src/MuleTextCtrl.cpp @@ -40,7 +40,7 @@ enum CMTC_Events { //! Cut text, uses provided ID CMTCE_Cut = wxID_CUT, - //! Copy text, uses privided ID + //! Copy text, uses provided ID CMTCE_Copy = wxID_COPY, //! Paste text, uses custom ID CMTCE_Paste = wxID_HIGHEST + 666, // Random satanic ID diff --git a/src/MuleTextCtrl.h b/src/MuleTextCtrl.h index f97ca06c5d..598a26037a 100644 --- a/src/MuleTextCtrl.h +++ b/src/MuleTextCtrl.h @@ -69,7 +69,7 @@ class CMuleTextCtrl : public wxTextCtrl * * Please note that by using the RIGHT_DOWN event, I'm disabling the second * type of selection that the wxTextCtrl supports. However, I frankly only - * noticed that second selection type while implementing this, so I doubth + * noticed that second selection type while implementing this, so I doubt * that anyone will be missing it ... */ void OnRightDown( wxMouseEvent& evt ); @@ -77,7 +77,7 @@ class CMuleTextCtrl : public wxTextCtrl /** * This function takes care of pasting text. * - * Pleaes note that it is only needed because wxMenu disallows enabling and + * Please note that it is only needed because wxMenu disallows enabling and * disabling of items that use the predefined wxID_PASTE id. This is the * only one of the already provided commands we need to override, since the * others already work just fine. diff --git a/src/MuleThread.h b/src/MuleThread.h index 29f1c66fef..933703f698 100644 --- a/src/MuleThread.h +++ b/src/MuleThread.h @@ -40,7 +40,7 @@ class CMuleThread : public wxThread * Stops the thread. * * For detached threads, this function is equivalent - * to Delete, but is also useable for joinable threads, + * to Delete, but is also usable for joinable threads, * where Delete should not be used, due to crashes * experienced in that case. In the case of joinable * threads, Wait is called rather than Delete. @@ -61,7 +61,7 @@ class CMuleThread : public wxThread virtual bool TestDestroy() { // m_stop is checked last, because some functionality is - // dependant upon wxThread::TestDestroy() being called, + // dependent upon wxThread::TestDestroy() being called, // for instance Pause(). return wxThread::TestDestroy() || m_stop; } diff --git a/src/MuleTrayIcon.cpp b/src/MuleTrayIcon.cpp index d06179cfe5..b57ef3bc52 100644 --- a/src/MuleTrayIcon.cpp +++ b/src/MuleTrayIcon.cpp @@ -235,7 +235,7 @@ void CMuleTrayIcon::SetTrayIcon(int Icon, uint32 percent) IconWithSpeed.SelectObject(TempBMP); - // Speed bar is: centered, taking 80% of the icon heigh, and + // Speed bar is: centered, taking 80% of the icon height, and // right-justified taking a 10% of the icon width. // X @@ -293,7 +293,7 @@ wxMenu* CMuleTrayIcon::CreatePopupMenu() bool showMBpsUp = (MBpsUp >= 1); bool showMBpsDown = (MBpsDown >= 1); - // Creates dinamically the menu to show the user. + // Dynamically creates the menu to show the user. wxMenu *traymenu = new wxMenu(); traymenu->SetTitle(_("aMule Tray Menu")); diff --git a/src/MuleTrayIcon.h b/src/MuleTrayIcon.h index 9d45b3434f..2766c49186 100644 --- a/src/MuleTrayIcon.h +++ b/src/MuleTrayIcon.h @@ -63,7 +63,7 @@ class CMuleTrayIcon : public wxTaskBarIcon { public: /** - * Contructor. + * Constructor. */ CMuleTrayIcon(); diff --git a/src/MuleUDPSocket.cpp b/src/MuleUDPSocket.cpp index 6f09a59f38..e201c2c671 100644 --- a/src/MuleUDPSocket.cpp +++ b/src/MuleUDPSocket.cpp @@ -324,7 +324,7 @@ bool CMuleUDPSocket::SendTo(uint8_t *buffer, uint32_t length, uint32_t ip, uint1 // flag so it gets resent when socket is ready. m_busy = true; } else if (uint32 error = m_socket->LastError()) { - // An error which we can't handle happended, so we drop + // An error which we can't handle happened, so we drop // the packet rather than risk entering an infinite loop. AddLogLineN((wxT("WARNING! ") + m_name + wxT(": Packet to ")) << Uint32_16toStringIP_Port(ip, port) diff --git a/src/MuleUDPSocket.h b/src/MuleUDPSocket.h index 1740c7a55a..0be9a033fe 100644 --- a/src/MuleUDPSocket.h +++ b/src/MuleUDPSocket.h @@ -60,7 +60,7 @@ class CMuleUDPSocket : public ThrottledControlSocket * @param name Name used when logging events. * @param id The ID used for events. * @param address The address where the socket will listen. - * @param ProxyData ProxyData assosiated with the socket. + * @param ProxyData ProxyData associated with the socket. */ CMuleUDPSocket(const wxString& name, int id, const amuleIPV4Address& address, const CProxyData* ProxyData = NULL); diff --git a/src/NetworkFunctions.h b/src/NetworkFunctions.h index 46d1ec0d3b..8e57968400 100644 --- a/src/NetworkFunctions.h +++ b/src/NetworkFunctions.h @@ -65,12 +65,12 @@ inline wxString KadIPPortToString(uint32_t ip, uint16_t port) * ip-address is ignored and the resulting IP is saved in * anti-host order. * - * The reason for the existance of this function is the fact that + * The reason for the existence of this function is the fact that * the standard inet_aton function treats numbers with 0 prefixed * as octals, which is desirable. * * Note: The reference value will not be changed unless the string - * contains a valid IP adress. + * contains a valid IP address. */ bool StringIPtoUint32(const wxString &strIP, uint32& Ip); diff --git a/src/OScopeCtrl.cpp b/src/OScopeCtrl.cpp index 70870a2867..13a0daf0e2 100644 --- a/src/OScopeCtrl.cpp +++ b/src/OScopeCtrl.cpp @@ -316,7 +316,7 @@ void COScopeCtrl::OnPaint(wxPaintEvent& WXUNUSED(evt)) dc.DrawBitmap(m_bmapPlot, m_rectPlot.x, m_rectPlot.y, false); // draw the dotted lines. - // This is done last because wxMAC does't support the wxOR logical + // This is done last because wxMAC doesn't support the wxOR logical // operation, preventing us from simply blitting the plot on top of // the grid bitmap. @@ -404,7 +404,7 @@ void COScopeCtrl::DrawPoints(const std::vector &apf, unsigned cntPoints // this appends a new set of data points to a graph; all of the plotting is // directed to the memory based bitmap associated with dcPlot // the will subsequently be BitBlt'd to the client in OnPaint - // draw the next line segement + // draw the next line segment unsigned y, yPrev; unsigned cntPixelOffset = std::min((unsigned)(m_rectPlot.GetWidth()-1), (cntPoints-1)*nShiftPixels); PlotData_t* ppds = pdsTrends; diff --git a/src/Observable.h b/src/Observable.h index 312ecf9d2f..46e5d97eab 100644 --- a/src/Observable.h +++ b/src/Observable.h @@ -38,7 +38,7 @@ template class CObservable; /** * This class implements the observable part of an Observer/Observable pattern. * - * The EventType paramter is used to specify a protocol for the event-type used + * The EventType parameter is used to specify a protocol for the event-type used * by a particular Observer/Observable set and allows for any level of * information passing to be used, depending on the context. * @@ -108,9 +108,9 @@ class CObservable * This function subscribes an observer to events from this observable. * * @param o The observer that wishes to observe this object. - * @return True if it succesfully subscribed, false otherwise. + * @return True if it successfully subscribed, false otherwise. * - * If the subscription was succesful, ObserverAdded() will be called + * If the subscription was successful, ObserverAdded() will be called * on "o", allowing the subclass to initialize the the observer's state. */ bool AddObserver( ObserverType* o ); diff --git a/src/ObservableQueue.h b/src/ObservableQueue.h index 70d67daa01..e2b2ea3d94 100644 --- a/src/ObservableQueue.h +++ b/src/ObservableQueue.h @@ -140,8 +140,8 @@ class CQueueEvent * object or position, instead just a "add/remove one of these" rule. * * The main purpose of this class is to allow another class to follow - * a list or queue, regardles of changes in actual order of the items - * and regardles of changes to the contents. + * a list or queue, regardless of changes in actual order of the items + * and regardless of changes to the contents. */ template class CObservableQueue : public CObservable< CQueueEvent > @@ -224,7 +224,7 @@ class CQueueObserver : public CObserver< CQueueEvent > * Note: Objects will not be returned in the same order as * they were found in the original observable. Also, note * that calling GetNext() on an empty queue should only be - * done if the default contructed value does not match a + * done if the default constructed value does not match a * valid object and can be used to check for End of Queue. */ ValueType GetNext(); diff --git a/src/OtherFunctions.cpp b/src/OtherFunctions.cpp index 582a60b6ea..27dedc0939 100644 --- a/src/OtherFunctions.cpp +++ b/src/OtherFunctions.cpp @@ -138,7 +138,7 @@ FileType GetFiletype(const CPath& filename) } -// Returns the (translated) description assosiated with a FileType +// Returns the (translated) description associated with a FileType wxString GetFiletypeDesc(FileType type, bool translated) { switch ( type ) { @@ -201,7 +201,7 @@ wxString GetFiletypeDesc(FileType type, bool translated) } } -// Returns the Typename, examining the extention of the given filename +// Returns the Typename, examining the extension of the given filename wxString GetFiletypeByName(const CPath& filename, bool translated) { @@ -285,7 +285,7 @@ static wxChar base16Lookup[BASE16_LOOKUP_MAX][2] = { // // [In] // buffer: Pointer to byte array -// bufLen: Lenght of buffer array +// bufLen: Length of buffer array // // [Return] // wxString object with BASE16 encoded byte array @@ -306,7 +306,7 @@ wxString EncodeBase16(const unsigned char* buffer, unsigned int bufLen) // // [In] // base16Buffer: String containing BASE16 -// base16BufLen: Lenght BASE16 coded string's length +// base16BufLen: Length BASE16 coded string's length // // [Out] // buffer: byte array containing decoded string @@ -335,7 +335,7 @@ unsigned int DecodeBase16(const wxString &base16Buffer, unsigned int base16BufLe // // [In] // buffer: Pointer to byte array -// bufLen: Lenght of buffer array +// bufLen: Length of buffer array // // [Return] // wxString object with BASE32 encoded byte array @@ -373,7 +373,7 @@ wxString EncodeBase32(const unsigned char* buffer, unsigned int bufLen) // // [In] // base32Buffer: String containing BASE32 -// base32BufLen: Lenght BASE32 coded string's length +// base32BufLen: Length BASE32 coded string's length // // [Out] // buffer: byte array containing decoded string @@ -619,7 +619,7 @@ unsigned int DecodeBase64(const wxString &base64Buffer, unsigned int base64BufLe } -// Returns the text assosiated with a category type +// Returns the text associated with a category type wxString GetCatTitle(AllCategoryFilter cat) { switch (cat) { @@ -915,7 +915,7 @@ EED2KFileType GetED2KFileTypeID(const CPath& fileName) } -// Retuns the ed2k file type term which is to be used in server searches +// Returns the ed2k file type term which is to be used in server searches wxString GetED2KFileTypeSearchTerm(EED2KFileType iFileID) { if (iFileID == ED2KFT_AUDIO) return ED2KFTSTR_AUDIO; @@ -931,7 +931,7 @@ wxString GetED2KFileTypeSearchTerm(EED2KFileType iFileID) } -// Returns a file type which is used eMule internally only, examining the extention of the given filename +// Returns a file type which is used eMule internally only, examining the extension of the given filename wxString GetFileTypeByName(const CPath& fileName) { EED2KFileType iFileType = GetED2KFileTypeID(fileName); @@ -948,7 +948,7 @@ wxString GetFileTypeByName(const CPath& fileName) } -// Retuns the ed2k file type integer ID which is to be used for publishing+searching +// Returns the ed2k file type integer ID which is to be used for publishing+searching EED2KFileType GetED2KFileTypeSearchID(EED2KFileType iFileID) { switch (iFileID) { diff --git a/src/OtherFunctions.h b/src/OtherFunctions.h index dd0d4a22ab..85145df232 100644 --- a/src/OtherFunctions.h +++ b/src/OtherFunctions.h @@ -155,7 +155,7 @@ template void DeleteContents(STL_CONTAINER& container) { // Ensure that the actual container wont contain dangling pointers during - // this operation, to ensure that the destructors cant access them. + // this operation, to ensure that the destructors can't access them. STL_CONTAINER copy; std::swap(copy, container); @@ -226,7 +226,7 @@ unsigned int DecodeBase64(const wxString &base64Buffer, unsigned int base64BufLe // Converts the number of bytes to human readable form. wxString CastItoXBytes(uint64 count); -// Converts the number to human readable form, abbreviating when nessecary. +// Converts the number to human readable form, abbreviating when necessary. wxString CastItoIShort(uint64 number); // Converts a number of bytes to a human readable speed value. wxString CastItoSpeed(uint32 bytes); @@ -240,7 +240,7 @@ wxString GetRateString(uint16 rate); // The following functions are used to identify and/or name the type of a file enum FileType { ftAny, ftVideo, ftAudio, ftArchive, ftCDImage, ftPicture, ftText, ftProgram }; -// Examins a filename and returns the enumerated value assosiated with it, or ftAny if unknown extension +// Examins a filename and returns the enumerated value associated with it, or ftAny if unknown extension FileType GetFiletype(const CPath& filename); // Returns the description of a filetype: Movies, Audio, Pictures and so on... wxString GetFiletypeDesc(FileType type, bool translated = true); diff --git a/src/Packet.cpp b/src/Packet.cpp index 3e0f77481f..03e8367c27 100644 --- a/src/Packet.cpp +++ b/src/Packet.cpp @@ -29,7 +29,7 @@ #include -#include "Logger.h" // Neeed for AddDebugLogLineN +#include "Logger.h" // Needed for AddDebugLogLineN #include "MemFile.h" // Needed for CMemFile #include "OtherStructs.h" // Needed for Header_Struct #include "ArchSpecific.h" // Needed for ENDIAN_* @@ -275,7 +275,7 @@ void CPacket::PackPacket() bool CPacket::UnPackPacket(uint32 uMaxDecompressedSize) { wxASSERT( prot == OP_PACKEDPROT || prot == OP_ED2KV2PACKEDPROT); // OP_ED2KV2PACKEDPROT is experimental aMule test code, - // this should not happen yet. Leave a warining in the log. + // this should not happen yet. Leave a warning in the log. if (prot == OP_ED2KV2PACKEDPROT) { AddDebugLogLineN(logPacketErrors, wxT("Received OP_ED2KV2PACKEDPROT.")); diff --git a/src/PartFile.cpp b/src/PartFile.cpp index 932ffea2b7..0f28ac4869 100644 --- a/src/PartFile.cpp +++ b/src/PartFile.cpp @@ -471,7 +471,7 @@ uint8 CPartFile::LoadPartFile(const CPath& in_directory, const CPath& filename, case FT_KADLASTPUBLISHSRC:{ SetLastPublishTimeKadSrc(newtag.GetInt(), 0); if(GetLastPublishTimeKadSrc() > (uint32)time(NULL)+KADEMLIAREPUBLISHTIMES) { - //There may be a posibility of an older client that saved a random number here.. This will check for that.. + //There may be a possibility of an older client that saved a random number here.. This will check for that.. SetLastPublishTimeKadSrc(0,0); } break; @@ -803,7 +803,7 @@ bool CPartFile::SavePartFile(bool Initial) file.WriteUInt32(tagcount); - //#warning Kry - Where are lost by coruption and gained by compression? + //#warning Kry - Where are lost by corruption and gained by compression? // 0 (unicoded part file name) // We write it with BOM to keep eMule compatibility. Note that the 'printable' filename is saved, @@ -839,7 +839,7 @@ bool CPartFile::SavePartFile(bool Initial) CTagInt32(FT_ATREQUESTED, statistic.GetAllTimeRequests()).WriteTagToFile( &file ); // 13 CTagInt32(FT_ATACCEPTED, statistic.GetAllTimeAccepts()).WriteTagToFile( &file ); // 14 - // currupt part infos + // corrupt part infos if (!m_corrupted_list.empty()) { wxString strCorruptedParts; std::list::iterator it = m_corrupted_list.begin(); @@ -1868,7 +1868,7 @@ bool CPartFile::GetNextRequestedBlock(CUpDownClient* sender, // This algorithm usually selects first the rarest chunk(s). However, partially // complete chunk(s) that is/are close to completion may overtake the priority // (priority inversion). - // For the common chuncks, the algorithm tries to spread the dowload between + // For the common chunks, the algorithm tries to spread the download between // the sources // @@ -1883,7 +1883,7 @@ bool CPartFile::GetNextRequestedBlock(CUpDownClient* sender, // Main loop uint16 newBlockCount = 0; while(newBlockCount != count) { - // Create a request block stucture if a chunk has been previously selected + // Create a request block structure if a chunk has been previously selected if(sender->GetLastPartAsked() != 0xffff) { Requested_Block_Struct* pBlock = new Requested_Block_Struct; if(GetNextEmptyBlockInPart(sender->GetLastPartAsked(), pBlock) == true) { @@ -1907,7 +1907,7 @@ bool CPartFile::GetNextRequestedBlock(CUpDownClient* sender, // Quantify all chunks (create list of chunks to download) // This is done only one time and only if it is necessary (=> CPU load) if(chunksList.empty()) { - // Indentify the locally missing part(s) that this source has + // Identify the locally missing part(s) that this source has for(uint16 i=0; i < partCount; ++i) { if(sender->IsPartAvailable(i) == true && GetNextEmptyBlockInPart(i, NULL) == true) { // Create a new entry for this chunk and add it to the list @@ -1918,7 +1918,7 @@ bool CPartFile::GetNextRequestedBlock(CUpDownClient* sender, } } - // Check if any bloks(s) could be downloaded + // Check if any blocks(s) could be downloaded if(chunksList.empty()) { break; // Exit main loop while() } @@ -2019,7 +2019,7 @@ bool CPartFile::GetNextRequestedBlock(CUpDownClient* sender, // Select the next chunk to download if(!chunksList.empty()) { - // Find and count the chunck(s) with the highest priority + // Find and count the chunk(s) with the highest priority uint16 chunkCount = 0; // Number of found chunks with same priority uint16 rank = 0xffff; // Highest priority found @@ -2105,7 +2105,7 @@ void CPartFile::CompleteFile(bool bIsHashingDone) StopFile(); m_is_A4AF_auto=false; SetStatus(PS_COMPLETING); - // guess I was wrong about not need to spaw a thread ... + // guess I was wrong about not need to spawn a thread ... // It is if the temp and incoming dirs are on different // partitions/drives and the file is large...[oz] // @@ -2501,7 +2501,7 @@ bool CPartFile::CheckFreeDiskSpace( uint64 neededSpace ) if ( thePrefs::IsCheckDiskspaceEnabled() ) { neededSpace += thePrefs::GetMinFreeDiskSpace(); - // Due to the the existance of sparse files, we cannot assume that + // Due to the the existence of sparse files, we cannot assume that // writes within the file doesn't cause new blocks to be allocated. // Therefore, we have to simply stop writing the moment the limit has // been exceeded. @@ -2731,7 +2731,7 @@ void CPartFile::AddClientSources(CMemFile* sources, unsigned nSourceFrom, uint8 } else { // for SX2: // We only check if the version is known by us and do a quick sanitize check on known version - // other then SX1, the packet will be ignored if any error appears, sicne it can't be a "misunderstanding" anymore + // other then SX1, the packet will be ignored if any error appears, since it can't be a "misunderstanding" anymore if (uClientSXVersion > SOURCEEXCHANGE2_VERSION || uClientSXVersion == 0 ){ AddDebugLogLineN(logPartFile, CFormat(wxT("Invalid source exchange type version: %i")) % uClientSXVersion); return; diff --git a/src/PartFile.h b/src/PartFile.h index 87aead8d00..48e39420d5 100644 --- a/src/PartFile.h +++ b/src/PartFile.h @@ -232,9 +232,9 @@ class CPartFile : public CKnownFile { bool DelSource( CUpDownClient* client ); /** - * Updates the requency of avilable parts from with the data the client provides. + * Updates the frequency of available parts from with the data the client provides. * - * @param client The clients whoose available parts should be considered. + * @param client The clients whose available parts should be considered. * @param increment If true, the counts are incremented, otherwise they are decremented. * * This functions updates the frequency list of file-parts, using the clients diff --git a/src/PartFileConvertDlg.cpp b/src/PartFileConvertDlg.cpp index a082b95dbf..fd6032588a 100644 --- a/src/PartFileConvertDlg.cpp +++ b/src/PartFileConvertDlg.cpp @@ -203,7 +203,7 @@ void CPartFileConvertDlg::OnAddFolder(wxCommandEvent& WXUNUSED(event)) wxStandardPaths::Get().GetDocumentsDir(), wxDD_DEFAULT_STYLE, wxDefaultPosition, this); if (!folder.IsEmpty()) { - int reply = wxMessageBox(_("Do you want the source files of succesfully imported downloads be deleted?"), + int reply = wxMessageBox(_("Do you want the source files of successfully imported downloads be deleted?"), _("Remove sources?"), wxYES_NO | wxCANCEL | wxICON_QUESTION, this); if (reply != wxCANCEL) { diff --git a/src/PlatformSpecific.h b/src/PlatformSpecific.h index 42e10718f5..7ea3074efa 100644 --- a/src/PlatformSpecific.h +++ b/src/PlatformSpecific.h @@ -63,7 +63,7 @@ enum EFSType { fsFAT, //! File Allocation Table fsNTFS, //! New Technology File System fsHFS, //! Hierarchical File System - fsHPFS, //! High Performace File System + fsHPFS, //! High Performance File System fsMINIX, //! Minix file system fsOther //! Unknown, other }; diff --git a/src/Preferences.cpp b/src/Preferences.cpp index a758d245ed..9b7fd3207e 100644 --- a/src/Preferences.cpp +++ b/src/Preferences.cpp @@ -232,13 +232,13 @@ wxString CPreferences::s_StatsServerURL; /** * Template Cfg class for connecting with widgets. * - * This template provides the base functionionality needed to syncronize a + * This template provides the base functionality needed to synchronize a * variable with a widget. However, please note that wxGenericValidator only * supports a few types (int, wxString, bool and wxArrayInt), so this template * can't always be used directly. * * Cfg_Str and Cfg_Bool are able to use this template directly, whereas Cfg_Int - * makes use of serveral workaround to enable it to be used with integers other + * makes use of several workaround to enable it to be used with integers other * than int. */ template @@ -291,7 +291,7 @@ class Cfg_Tmpl : public Cfg_Base } - /** Updates the assosiated variable, returning true on success. */ + /** Updates the associated variable, returning true on success. */ virtual bool TransferFromWindow() { if ( m_widget ) { @@ -311,7 +311,7 @@ class Cfg_Tmpl : public Cfg_Base return false; } - /** Updates the assosiated widget, returning true on success. */ + /** Updates the associated widget, returning true on success. */ virtual bool TransferToWindow() { if ( m_widget ) { @@ -541,14 +541,14 @@ class Cfg_Int : public Cfg_Tmpl * Helper function for creating new Cfg_Ints. * * @param keyname The cfg-key under which the item should be saved. - * @param value The variable to syncronize. The type of this variable defines the type used to create the Cfg_Int. + * @param value The variable to synchronize. The type of this variable defines the type used to create the Cfg_Int. * @param defaultVal The default value if the key isn't found when loading the value. * @return A pointer to the new Cfg_Int object. The caller is responsible for deleting it. * * This template-function returns a Cfg_Int of the appropriate type for the * variable used as argument and should be used to avoid having to specify * the integer type when adding a new Cfg_Int, since that's just increases - * the maintainence burden. + * the maintenance burden. */ template Cfg_Base* MkCfg_Int( const wxString& keyname, TYPE& value, int defaultVal ) @@ -741,7 +741,7 @@ class Cfg_Lang : public Cfg_PureInt, public Cfg_Lang_Base wxBusyCursor busyCursor; aMuleLanguages[0].displayname = wxGetTranslation(aMuleLanguages[0].name); - // This supresses error-messages about invalid locales + // This suppresses error-messages about invalid locales for (unsigned int i = 1; i < itemsof(aMuleLanguages); ++i) { if ((aMuleLanguages[i].id > wxLANGUAGE_USER_DEFINED) || wxLocale::IsAvailable(aMuleLanguages[i].id)) { wxLogNull logTarget; @@ -956,7 +956,7 @@ CPreferences::CPreferences() LoadPreferences(); ReloadSharedFolders(); - // serverlist adresses + // serverlist addresses CTextFile slistfile; if (slistfile.Open(s_configDir + wxT("addresses.dat"), CTextFile::read)) { adresses_list = slistfile.ReadLines(); @@ -1134,7 +1134,7 @@ void CPreferences::BuildItemList( const wxString& appdir ) NewCfgItem(IDC_STARTMIN, (new Cfg_Bool( wxT("/eMule/StartupMinimized"), s_startMinimized, false ))); /** - * GUI appearence + * GUI appearance **/ NewCfgItem(IDC_3DDEPTH, (MkCfg_Int( wxT("/eMule/3DDepth"), s_depth3D, 10 ))); NewCfgItem(IDC_TOOLTIPDELAY, (MkCfg_Int( wxT("/eMule/ToolTipDelay"), s_iToolDelayTime, 1 ))); diff --git a/src/Preferences.h b/src/Preferences.h index 624d921199..7e48137c4c 100644 --- a/src/Preferences.h +++ b/src/Preferences.h @@ -71,7 +71,7 @@ enum AllCategoryFilter { * * The purpose of this class is to perform two tasks: * 1) To load and save a variable using wxConfig - * 2) If nescecarry, to syncronize it with a widget + * 2) If nescecarry, to synchronize it with a widget * * This pure-virtual class servers as the base of all the Cfg types * defined below, and exposes the entire interface. @@ -81,7 +81,7 @@ enum AllCategoryFilter { * for this. * * To create a sub-class you need only provide the Load/Save functionality, - * as it is given that not all variables have a widget assosiated. + * as it is given that not all variables have a widget associated. */ class Cfg_Base { @@ -102,11 +102,11 @@ class Cfg_Base virtual ~Cfg_Base() {} /** - * This function loads the assosiated variable from the provided config object. + * This function loads the associated variable from the provided config object. */ virtual void LoadFromFile(wxConfigBase* cfg) = 0; /** - * This function saves the assosiated variable to the provided config object. + * This function saves the associated variable to the provided config object. */ virtual void SaveToFile(wxConfigBase* cfg) = 0; @@ -136,7 +136,7 @@ class Cfg_Base virtual bool ConnectToWidget( int WXUNUSED(id), wxWindow* WXUNUSED(parent) = NULL ) { return false; } /** - * Gets the key assosiated with Cfg object. + * Gets the key associated with Cfg object. * * @return The config-key of this object. */ diff --git a/src/PrefsUnifiedDlg.cpp b/src/PrefsUnifiedDlg.cpp index 5e27314396..ad022a3b73 100644 --- a/src/PrefsUnifiedDlg.cpp +++ b/src/PrefsUnifiedDlg.cpp @@ -139,7 +139,7 @@ END_EVENT_TABLE() * Creates an command-event for the given checkbox. * * This can be used enforce logical constraints by passing by - * sending a check-box event for each checkbox, when transfering + * sending a check-box event for each checkbox, when transferring * to the UI. However, it should also be used for checkboxes that * have no side-effects other than enabling/disabling other * widgets in the preferences dialogs. @@ -865,7 +865,7 @@ void PrefsUnifiedDlg::OnCheckBoxChange(wxCommandEvent& event) break; case IDC_MSGFILTER: - // Toogle All filter options + // Toggle All filter options FindWindow(IDC_MSGFILTER_ALL)->Enable(value); FindWindow(IDC_MSGFILTER_NONSECURE)->Enable(value); FindWindow(IDC_MSGFILTER_NONFRIENDS)->Enable(value); @@ -879,7 +879,7 @@ void PrefsUnifiedDlg::OnCheckBoxChange(wxCommandEvent& event) break; case IDC_MSGFILTER_ALL: - // Toogle filtering by data. + // Toggle filtering by data. FindWindow(IDC_MSGFILTER_NONSECURE)->Enable(!value); FindWindow(IDC_MSGFILTER_NONFRIENDS)->Enable(!value); FindWindow(IDC_MSGFILTER_WORD)->Enable(!value); @@ -892,7 +892,7 @@ void PrefsUnifiedDlg::OnCheckBoxChange(wxCommandEvent& event) break; case IDC_MSGFILTER_WORD: - // Toogle filter word list. + // Toggle filter word list. FindWindow(IDC_MSGWORD)->Enable(value); break; diff --git a/src/PrefsUnifiedDlg.h b/src/PrefsUnifiedDlg.h index 0ad2df3174..c345d65952 100644 --- a/src/PrefsUnifiedDlg.h +++ b/src/PrefsUnifiedDlg.h @@ -80,7 +80,7 @@ class PrefsUnifiedDlg : public wxDialog bool CfgChanged(int id); /** - * Helper functions which returns the Cfg assosiated with the specified id. + * Helper functions which returns the Cfg associated with the specified id. */ Cfg_Base* GetCfg(int id); diff --git a/src/Proxy.cpp b/src/Proxy.cpp index 5ac0c43bf7..60280871da 100644 --- a/src/Proxy.cpp +++ b/src/Proxy.cpp @@ -188,7 +188,7 @@ bool CProxyStateMachine::Start(const amuleIPV4Address &peerAddress, CLibSocket * // const wxIPV4address &peer = dynamic_cast(peerAddress); // m_peerAddress = new amuleIPV4Address(peer); //} catch (const std::bad_cast& WXUNUSED(e)) { - // // Should process other types of wxIPAddres before quitting + // // Should process other types of wxIPAddress before quitting // AddDebugLogLineN(logProxy, wxT("(1)bad_cast exception!")); // wxFAIL; // return false; @@ -265,7 +265,7 @@ void CProxyStateMachine::AddDummyEvent() void CProxyStateMachine::ReactivateSocket() { - /* If proxy is beeing used, then the TCP socket handlers + /* If proxy is being used, then the TCP socket handlers * (CServerSocketHandler and CClientTCPSocketHandler) will not * receive a wxSOCKET_CONNECTION event, because the connection has * already started with the proxy. So we must add a wxSOCKET_CONNECTION diff --git a/src/RC4Encrypt.cpp b/src/RC4Encrypt.cpp index 38dd908de2..823d25bebd 100644 --- a/src/RC4Encrypt.cpp +++ b/src/RC4Encrypt.cpp @@ -47,7 +47,7 @@ void CRC4EncryptableBuffer::Append(const uint8* buffer, int n) } else { throw std::runtime_error( "(CRC4EncryptableBuffer::Append): " - "Tryed to append data to an encrypted buffer."); + "Tried to append data to an encrypted buffer."); } } diff --git a/src/RLE.cpp b/src/RLE.cpp index ae5642fb34..735e5d3438 100644 --- a/src/RLE.cpp +++ b/src/RLE.cpp @@ -235,7 +235,7 @@ const uint8 * RLE_Data::Encode(const ArrayOfUInts64 &data, int &outlen, bool &ch { // uint64 is copied to a uint8 buffer // first all low bytes, then all second low bytes and so on - // so inital RLE will benefit from high bytes being equal (zero) + // so initial RLE will benefit from high bytes being equal (zero) // 0x000003045A6A7A8A, 0x000003045B6B7B8B // 8A8B7A7B6A6B5A5B0404030300000000 int size = (int) data.size(); diff --git a/src/RLE.h b/src/RLE.h index 11ccc4eaf7..2d452fced8 100644 --- a/src/RLE.h +++ b/src/RLE.h @@ -68,7 +68,7 @@ class RLE_Data // data: block to encode // inlen: number of bytes to encode. May be zero, then data can also be 0. // outlen: here the number of encoded bytes gets stored (0 if inlen is 0) - // changed: becomes true if the size has changed or a change in the data occured, + // changed: becomes true if the size has changed or a change in the data occurred, // so the differential data (before encoding) is not all zero // // return: new buffer with encoded data, must be deleted after use! diff --git a/src/RangeMap.h b/src/RangeMap.h index 51a23a45e2..7b3742855e 100644 --- a/src/RangeMap.h +++ b/src/RangeMap.h @@ -33,7 +33,7 @@ /** - * Default helper structure for normal CRangeMap instantations. + * Default helper structure for normal CRangeMap instantiations. * * Specializations should must have the following properties. * - The four value typedefs (see comments for details). @@ -107,7 +107,7 @@ struct CRangeMapHelper * than by erasing and then re-inserting them. * * A specialization of this class exists (typedef'd as CRangeSet), which does - * not assosiate a value with each range. + * not associate a value with each range. * * NOTE: KEYTYPE is assumed to be an unsigned integer type! */ @@ -352,7 +352,7 @@ class CRangeMap * @param key A value that may or may not be covered by a range. * @return end() or the iterator of the range covering key. * - * A range is considered to cover a value if the value is greather than or + * A range is considered to cover a value if the value is greater than or * equal to the start-key and less than or equal to the end-key. */ // Find the range which contains key (it->first <= key <= it->second->first) @@ -395,7 +395,7 @@ class CRangeMap * * @param startPos The start position of the range, also considered part of the range. * @param endPos The end position of the range, also considered part of the range. - * @param object The user-data to be assosiated with the range. + * @param object The user-data to be associated with the range. * @return An iterator pointing to the resulting range, covering at least the specified range. * * This function inserts the specified range into the map, while overwriting @@ -531,7 +531,7 @@ class CRangeMap * Finds the optimal location to start looking for insertion points. * * This is the first range whose start comes after the new start. We check - * the last element first, since sequential insertions are commen. + * the last element first, since sequential insertions are common. */ RangeIterator get_insert_it(KEYTYPE start) { diff --git a/src/SHA.cpp b/src/SHA.cpp index 2d831a8711..63d71206fd 100644 --- a/src/SHA.cpp +++ b/src/SHA.cpp @@ -74,7 +74,7 @@ CSHA::CSHA() To obtain the highest speed on processors with 32-bit words, this code needs to determine the order in which bytes are packed into such words. The following block of code is an attempt to capture the most obvious - ways in which various environemnts specify their endian definitions. + ways in which various environments specify their endian definitions. It may well fail, in which case the definitions will need to be set by editing at the points marked **** EDIT HERE IF NECESSARY **** below. */ @@ -184,7 +184,7 @@ void CSHA::Add(const void* pData, uint32 nLength) if((m_nCount[0] += nLength) < nLength) ++(m_nCount[1]); - while(nLength >= space) /* tranfer whole blocks while possible */ + while(nLength >= space) /* transfer whole blocks while possible */ { memcpy(((unsigned char*)m_nBuffer) + pos, sp, space); sp += space; nLength -= space; space = SHA1_BLOCK_SIZE; pos = 0; diff --git a/src/SHAHashSet.cpp b/src/SHAHashSet.cpp index 8aaed2fb51..688d566302 100644 --- a/src/SHAHashSet.cpp +++ b/src/SHAHashSet.cpp @@ -106,7 +106,7 @@ CAICHHashTree* CAICHHashTree::FindHash(uint64 nStartPos, uint64 nSize, uint8* nL // this is the searched hash return this; } else if (m_nDataSize <= m_nBaseSize) { // sanity - // this is already the last level, cant go deeper + // this is already the last level, can't go deeper wxFAIL; return NULL; } else { @@ -276,10 +276,10 @@ bool CAICHHashTree::CreatePartRecoveryData(uint64 nStartPos, uint64 nSize, CFile if (nStartPos == 0 && nSize == m_nDataSize) { // this is the searched part, now write all blocks of this part - // hashident for this level will be adjsuted by WriteLowestLevelHash + // hashident for this level will be adjusted by WriteLowestLevelHash return WriteLowestLevelHashs(fileDataOut, wHashIdent, false, b32BitIdent); } else if (m_nDataSize <= m_nBaseSize) { // sanity - // this is already the last level, cant go deeper + // this is already the last level, can't go deeper wxFAIL; return false; } else { @@ -415,7 +415,7 @@ bool CAICHHashTree::SetHash(CFileDataIO* fileInput, uint32 wHashIdent, sint8 nLe m_bHashValid = true; return true; } else if (m_nDataSize <= m_nBaseSize) { // sanity - // this is already the last level, cant go deeper + // this is already the last level, can't go deeper wxFAIL; return false; } else { @@ -551,7 +551,7 @@ bool CAICHHashSet::ReadRecoveryData(uint64 nPartStartPos, CMemFile* fileDataIn) // read hashs with 16 bit identifier uint16 nHashsAvailable = fileDataIn->ReadUInt16(); if (fileDataIn->GetLength()-fileDataIn->GetPosition() < nHashsToRead*(HASHSIZE+2u) || (nHashsToRead != nHashsAvailable && nHashsAvailable != 0)) { - // this check is redunant, CSafememfile would catch such an error too + // this check is redundant, CSafememfile would catch such an error too AddDebugLogLineN(logSHAHashSet, CFormat(wxT("Failed to read RecoveryData for '%s' - Received datasize/amounts of hashs was invalid")) % m_pOwner->GetFileName()); @@ -575,7 +575,7 @@ bool CAICHHashSet::ReadRecoveryData(uint64 nPartStartPos, CMemFile* fileDataIn) if (nHashsAvailable == 0 && fileDataIn->GetLength() - fileDataIn->GetPosition() >= 2) { nHashsAvailable = fileDataIn->ReadUInt16(); if (fileDataIn->GetLength()-fileDataIn->GetPosition() < nHashsToRead*(HASHSIZE+4u) || (nHashsToRead != nHashsAvailable && nHashsAvailable != 0)) { - // this check is redunant, CSafememfile would catch such an error too + // this check is redundant, CSafememfile would catch such an error too // TODO: theApp->QueueDebugLogLine(/*DLP_VERYHIGH,*/ false, _T("Failed to read RecoveryData for %s - Received datasize/amounts of hashs was invalid (2)"), m_pOwner->GetFileName() ); return false; } @@ -684,13 +684,13 @@ bool CAICHHashSet::SaveHashSet() } file.WriteUInt32(nHashCount); if (!m_pHashTree.WriteLowestLevelHashs(&file, 0, true, true)) { - // thats bad... really + // that's bad... really file.SetLength(nExistingSize); AddDebugLogLineC(logSHAHashSet, wxT("Failed to save HashSet: WriteLowestLevelHashs() failed!")); return false; } if (file.GetLength() != nExistingSize + (nHashCount+1)*HASHSIZE + 4) { - // thats even worse + // that's even worse file.SetLength(nExistingSize); AddDebugLogLineC(logSHAHashSet, wxT("Failed to save HashSet: Calculated and real size of hashset differ!")); return false; @@ -778,7 +778,7 @@ bool CAICHHashSet::LoadHashSet() return false; } -// delete the hashset except the masterhash (we dont keep aich hashsets in memory to save ressources) +// delete the hashset except the masterhash (we dont keep aich hashsets in memory to save resources) void CAICHHashSet::FreeHashSet() { if (m_pHashTree.m_pLeftTree) { diff --git a/src/SafeFile.cpp b/src/SafeFile.cpp index 2eb297393d..30f9a7f230 100644 --- a/src/SafeFile.cpp +++ b/src/SafeFile.cpp @@ -407,7 +407,7 @@ CTag *CFileDataIO::ReadTag(bool bOptACP) const // NOTE: This tag data type is accepted and stored only to give us the possibility to upgrade // the net in some months. // - // And still.. it doesnt't work this way without breaking backward compatibility. To properly + // And still.. it doesn't work this way without breaking backward compatibility. To properly // do this without messing up the network the following would have to be done: // - those tag types have to be ignored by any client, otherwise those tags would also be sent (and // that's really the problem) @@ -456,7 +456,7 @@ CTag *CFileDataIO::ReadTag(bool bOptACP) const // NOTE: This tag data type is accepted and stored only to give us the possibility to upgrade // the net in some months. // - // And still.. it doesnt't work this way without breaking backward compatibility + // And still.. it doesn't work this way without breaking backward compatibility case TAGTYPE_BSOB: { uint8 size = 0; diff --git a/src/SafeFile.h b/src/SafeFile.h index 723900b5c2..aff743a002 100644 --- a/src/SafeFile.h +++ b/src/SafeFile.h @@ -103,7 +103,7 @@ class CFileDataIO * the position and target buffer is left unchanged. * * However, it is also possible that the read will - * fail due to IO errors (bad hardware, ect), in which + * fail due to IO errors (bad hardware, etc), in which * case an CIOFailureException will be thrown. */ virtual void Read(void* buffer, size_t count) const; @@ -147,7 +147,7 @@ class CFileDataIO * @return The resulting text-string. * * Note that when SafeRead is set to true, CSafeFileIO will crop the length - * read from the lenght-field (see lenBytes), so that at most GetLength() - + * read from the length-field (see lenBytes), so that at most GetLength() - * GetPosition() bytes are read. * * @see CSafeFileIO::Read @@ -226,7 +226,7 @@ class CFileDataIO * Note that the return value must be the actual number of bytes * read or written, with the exception that in case of errors, -1 * may be returned. This is because the return value is used to - * detect if the operation succeded. + * detect if the operation succeeded. * * This function should not throw Either of the CSafeIOExceptions, * this is done by the CSafeFileIO::Read and the CSafeFileIO::Write diff --git a/src/SearchFile.h b/src/SearchFile.h index 9f7eb39b52..0243b359b0 100644 --- a/src/SearchFile.h +++ b/src/SearchFile.h @@ -92,7 +92,7 @@ class CSearchFile : public CAbstractFile, public CECID * Merges the two results into one. * * Merges the other result into this one, updating - * various informations. + * various information. * * @param other The file to be merged into this. */ diff --git a/src/SearchList.cpp b/src/SearchList.cpp index 6ea5f05337..d01ebe2d0c 100644 --- a/src/SearchList.cpp +++ b/src/SearchList.cpp @@ -290,7 +290,7 @@ CSearchList::~CSearchList() void CSearchList::RemoveResults(long searchID) { - // A non-existant search id will just be ignored + // A non-existent search id will just be ignored Kademlia::CSearchManager::StopSearch(searchID, true); ResultMap::iterator it = m_results.find(searchID); @@ -584,7 +584,7 @@ bool CSearchList::AddToList(CSearchFile* toadd, bool clientResponse) } - // Get, or implictly create, the map of results for this search + // Get, or implicitly create, the map of results for this search CSearchResultList& results = m_results[toadd->GetSearchID()]; for (size_t i = 0; i < results.size(); ++i) { @@ -725,7 +725,7 @@ CSearchList::CMemFilePtr CSearchList::CreateSearchData(CSearchParams& params, Se unsigned int iParameterCount = 0; if (_SearchExpr.m_aExpr.GetCount() <= 1) { - // lugdunummaster requested that searchs without OR or NOT operators, + // lugdunummaster requested that searches without OR or NOT operators, // and hence with no more expressions than the string itself, be sent // using a series of ANDed terms, intersecting the ANDs on the terms // (but prepending them) instead of putting the boolean tree at the start diff --git a/src/SearchList.h b/src/SearchList.h index 1a3dc20263..52d5f8cdf9 100644 --- a/src/SearchList.h +++ b/src/SearchList.h @@ -59,7 +59,7 @@ class CSearchList : public wxEvtHandler //! Structure used to pass search-parameters. struct CSearchParams { - /** Prevents accidential use of uninitialized variables. */ + /** Prevents accidental use of uninitialized variables. */ CSearchParams() { minSize = maxSize = availability = 0; } //! The actual string to search for. @@ -74,7 +74,7 @@ class CSearchList : public wxEvtHandler uint64_t minSize; //! The largest filesize in bytes to accept, zero for any. uint64_t maxSize; - //! The minumum available (source-count), zero for any. + //! The minimum available (source-count), zero for any. uint32_t availability; }; diff --git a/src/SearchListCtrl.cpp b/src/SearchListCtrl.cpp index 58108379f8..0487d48e64 100644 --- a/src/SearchListCtrl.cpp +++ b/src/SearchListCtrl.cpp @@ -90,7 +90,7 @@ m_filterEnabled(false) InsertColumn( ID_SEARCH_COL_TYPE, _("Type"), wxLIST_FORMAT_LEFT, 65, wxT("Y") ); InsertColumn( ID_SEARCH_COL_FILEID, _("FileID"), wxLIST_FORMAT_LEFT, 280, wxT("I") ); InsertColumn( ID_SEARCH_COL_STATUS, _("Status"), wxLIST_FORMAT_LEFT, 100, wxT("S") ); - InsertColumn( ID_SEARCH_COL_DIRECTORY, _("Directories"), wxLIST_FORMAT_LEFT, 280, wxT("D") ); // I would have prefered "Directory" but this is already translated + InsertColumn( ID_SEARCH_COL_DIRECTORY, _("Directories"), wxLIST_FORMAT_LEFT, 280, wxT("D") ); // I would have preferred "Directory" but this is already translated m_nResultsID = 0; @@ -471,7 +471,7 @@ int CSearchListCtrl::SortProc(wxUIntPtr item1, wxUIntPtr item2, long sortData) CSearchFile* file1 = reinterpret_cast(item1); CSearchFile* file2 = reinterpret_cast(item2); - // Modifies the result, 1 for ascending, -1 for decending + // Modifies the result, 1 for ascending, -1 for descending int modifier = (sortData & CMuleListCtrl::SORT_DES) ? -1 : 1; bool alternate = (sortData & CMuleListCtrl::SORT_ALT) != 0; @@ -516,7 +516,7 @@ int CSearchListCtrl::SortProc(wxUIntPtr item1, wxUIntPtr item2, long sortData) int cmp2 = CmpAny( file1->GetCompleteSourceCount(), file2->GetCompleteSourceCount() ); if ( alternate ) { - // Swap criterias + // Swap criteria int temp = cmp2; cmp2 = cmp; cmp = temp; diff --git a/src/SearchListCtrl.h b/src/SearchListCtrl.h index 953a415a75..90bebae6b4 100644 --- a/src/SearchListCtrl.h +++ b/src/SearchListCtrl.h @@ -72,7 +72,7 @@ class CSearchListCtrl : public CMuleListCtrl virtual ~CSearchListCtrl(); /** - * Adds ths specified file to the list. + * Adds the specified file to the list. * * @param The new result to be shown. * @@ -213,7 +213,7 @@ class CSearchListCtrl : public CMuleListCtrl * @param src The source list. * @param dst The list to be synced with the source list. * - * This function syncronises the following settings of two lists: + * This function synchronises the following settings of two lists: * - Sort column * - Sort direction * - Column widths diff --git a/src/ServerConnect.cpp b/src/ServerConnect.cpp index 20217e5467..85a84fdd80 100644 --- a/src/ServerConnect.cpp +++ b/src/ServerConnect.cpp @@ -175,7 +175,7 @@ void CServerConnect::StopConnectionTry() m_idRetryTimer.Stop(); } - // close all currenty opened sockets except the one which is connected to our current server + // close all currently opened sockets except the one which is connected to our current server for(SocketsList::iterator it = m_lstOpenSockets.begin(); it != m_lstOpenSockets.end(); ) { CServerSocket *pSck = *it++; if (pSck == connectedsocket) // don't destroy socket which is connected to server @@ -209,7 +209,7 @@ void CServerConnect::ConnectionEstablished(CServerSocket* sender) CMemFile data(256); data.WriteHash(thePrefs::GetUserHash()); - // Why pass an ID, if we are loggin in? + // Why pass an ID, if we are logging in? data.WriteUInt32(GetClientID()); data.WriteUInt16(thePrefs::GetPort()); data.WriteUInt32(4); // tagcount @@ -522,7 +522,7 @@ CServerConnect::CServerConnect(CServerList* in_serverlist, amuleIPV4Address &add m_recurseTryAnotherConnectionrequest = false; m_bTryObfuscated = thePrefs::IsServerCryptLayerTCPRequested(); - // initalize socket for udp packets + // initialize socket for udp packets if (thePrefs::GetNetworkED2K()) { serverudpsocket = new CServerUDPSocket(address, thePrefs::GetProxyData()); } else { @@ -600,11 +600,11 @@ void CServerConnect::KeepConnectionAlive() AddLogLineC(wxT("Client: OP_OFFERFILES")); #endif // compress packet - // - this kind of data is highly compressable (N * (1 MD4 and at least 3 string meta data tags and 1 integer meta data tag)) + // - this kind of data is highly compressible (N * (1 MD4 and at least 3 string meta data tags and 1 integer meta data tag)) // - the min. amount of data needed for one published file is ~100 bytes // - this function is called once when connecting to a server and when a file becomes shareable - so, it's called rarely. // - if the compressed size is still >= the original size, we send the uncompressed packet - // therefor we always try to compress the packet + // therefore we always try to compress the packet theStats::AddUpOverheadServer(packet->GetPacketSize()); connectedsocket->SendPacket(packet,true); diff --git a/src/ServerList.cpp b/src/ServerList.cpp index 8c526344be..4f37f0b54d 100644 --- a/src/ServerList.cpp +++ b/src/ServerList.cpp @@ -46,7 +46,7 @@ #include "Preferences.h" // Needed for thePrefs #include "amule.h" // Needed for theApp #include "Statistics.h" // Needed for theStats -#include "Packet.h" // Neeed for CPacket +#include "Packet.h" // Needed for CPacket #include "Logger.h" #include "ScopedPtr.h" #include @@ -284,10 +284,10 @@ void CServerList::ServerStats() } srand((unsigned)time(NULL)); - ping_server->SetRealLastPingedTime(tNow); // this is not used to calcualte the next ping, but only to ensure a minimum delay for premature pings + ping_server->SetRealLastPingedTime(tNow); // this is not used to calculate the next ping, but only to ensure a minimum delay for premature pings if (!ping_server->GetCryptPingReplyPending() && (!ping_server->GetLastPingedTime() || (tNow - ping_server->GetLastPingedTime()) >= UDPSERVSTATREASKTIME) && theApp->GetPublicIP() && thePrefs::IsServerCryptLayerUDPEnabled()) { // We try a obfsucation ping first and wait 20 seconds for an answer - // if it doesn't get responsed, we don't count it as error but continue with a normal ping + // if it doesn't get responded to, we don't count it as error but continue with a normal ping ping_server->SetCryptPingReplyPending(true); uint32 nPacketLen = 4 + (uint8)(rand() % 16); // max padding 16 bytes CScopedArray pRawPacket(nPacketLen); diff --git a/src/ServerListCtrl.cpp b/src/ServerListCtrl.cpp index 484ce48c60..f4f904ec68 100644 --- a/src/ServerListCtrl.cpp +++ b/src/ServerListCtrl.cpp @@ -172,7 +172,7 @@ void CServerListCtrl::RemoveAllServers(int state) void CServerListCtrl::RefreshServer( CServer* server ) { - // Cant really refresh a NULL server + // Can't really refresh a NULL server if (!server) { return; } @@ -300,7 +300,7 @@ void CServerListCtrl::RefreshServer( CServer* server ) #endif - // Deletions of items causes rather large ammount of flicker, so to + // Deletions of items causes rather large amount of flicker, so to // avoid this, we resort the list to ensure correct ordering. if (!IsItemSorted(itemnr)) { SortList(); diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp index 5d7755f822..9a9ebaedd5 100644 --- a/src/ServerSocket.cpp +++ b/src/ServerSocket.cpp @@ -335,7 +335,7 @@ bool CServerSocket::ProcessPacket(const uint8_t* packet, uint32 size, int8 opcod if (size >= 4+4 /* uint32 (ID) + uint32 (TCP flags)*/) { cur_server->SetTCPFlags(data.ReadUInt32()); if (size >= 4+4+4 /* uint32 (ID) + uint32 (TCP flags) + uint32 (aux port) */) { - // aux port login : we should use the 'standard' port of this server to advertize to other clients + // aux port login : we should use the 'standard' port of this server to advertise to other clients ConnPort = data.ReadUInt32(); cur_server->SetPort(ConnPort); if (cur_server->GetAuxPortsList().IsEmpty()) { @@ -464,7 +464,7 @@ bool CServerSocket::ProcessPacket(const uint8_t* packet, uint32 size, int8 opcod } case OP_SERVERSTATUS: { AddDebugLogLineN(logServer, wxT("Server: OP_SERVERSTATUS")); - // FIXME some statuspackets have a different size -> why? structur? + // FIXME some statuspackets have a different size -> why? structure? if (size < 8) { throw wxString(wxT("Invalid server status packet")); } diff --git a/src/ServerUDPSocket.cpp b/src/ServerUDPSocket.cpp index 192bebdd70..2630dc127a 100644 --- a/src/ServerUDPSocket.cpp +++ b/src/ServerUDPSocket.cpp @@ -115,7 +115,7 @@ void CServerUDPSocket::ProcessPacket(CMemFile& packet, uint8 opcode, uint32 ip, try { // Imported: OP_GLOBSEARCHRES, OP_GLOBFOUNDSOURCES & OP_GLOBSERVSTATRES - // This makes Server UDP Flags to be set correctly so we use less bandwith on asking servers for sources + // This makes Server UDP Flags to be set correctly so we use less bandwidth on asking servers for sources // Also we process Search results and Found sources correctly now on 16.40 behaviour. switch(opcode){ case OP_GLOBSEARCHRES: { @@ -262,7 +262,7 @@ void CServerUDPSocket::ProcessPacket(CMemFile& packet, uint8 opcode, uint32 ip, // old packet: // new packet: // - // NOTE: To properly distinguish between the two packets which are both useing the same opcode... + // NOTE: To properly distinguish between the two packets which are both using the same opcode... // the first two bytes of (in network byte order) have to be an invalid at least. uint16 Len = packet.ReadUInt16(); @@ -359,7 +359,7 @@ void CServerUDPSocket::SendPacket(CPacket* packet, CServer* host, bool delPacket } // 4 (default) for standard sending, 12 for obfuscated ping, that's all for now. - // Might be changed if encrypted bellow, so don't move it. + // Might be changed if encrypted below, so don't move it. item.port = host->GetPort() + port_offset; // We might need to encrypt the packet for this server. diff --git a/src/SharedFileList.cpp b/src/SharedFileList.cpp index 97a8eec03e..7a96a938cf 100644 --- a/src/SharedFileList.cpp +++ b/src/SharedFileList.cpp @@ -740,11 +740,11 @@ void CSharedFileList::SendListToServer(){ CPacket* packet = new CPacket(files, OP_EDONKEYPROT, OP_OFFERFILES); // compress packet - // - this kind of data is highly compressable (N * (1 MD4 and at least 3 string meta data tags and 1 integer meta data tag)) + // - this kind of data is highly compressible (N * (1 MD4 and at least 3 string meta data tags and 1 integer meta data tag)) // - the min. amount of data needed for one published file is ~100 bytes // - this function is called once when connecting to a server and when a file becomes shareable - so, it's called rarely. // - if the compressed size is still >= the original size, we send the uncompressed packet - // therefor we always try to compress the packet + // therefore we always try to compress the packet if (server->GetTCPFlags() & SRV_TCPFLG_COMPRESSION){ packet->PackPacket(); } @@ -1008,7 +1008,7 @@ wxString CSharedFileList::GetPublicSharedDirName(const CPath& dir) wxASSERT( strPublicName.GetChar(0) == cPathSepa ); strPublicName = strPublicName.Right(strPublicName.Length() - 1); } else { - // must be a rootdirectory on Windos + // must be a rootdirectory on Windows wxASSERT( strDirectoryTmp.Length() == 2 ); strPublicName = strDirectoryTmp; } diff --git a/src/SharedFilesWnd.cpp b/src/SharedFilesWnd.cpp index 7bd8fd8fd5..2e421543a3 100644 --- a/src/SharedFilesWnd.cpp +++ b/src/SharedFilesWnd.cpp @@ -150,7 +150,7 @@ void CSharedFilesWnd::SelectionUpdated() m_bar_requests->SetValue( 0 ); CastChild(IDC_SREQUESTED, wxStaticText)->SetLabel( wxT("- / -") ); - // Accepted requets + // Accepted requests m_bar_accepted->SetValue( 0 ); CastChild(IDC_SACCEPTED, wxStaticText)->SetLabel( wxT("- / -") ); @@ -169,7 +169,7 @@ void CSharedFilesWnd::SelectionUpdated() wxString labelReq = CFormat(wxT("%d / %d")) % session_requests % all_requests; CastChild(IDC_SREQUESTED, wxStaticText)->SetLabel(labelReq); - // Accepted requets + // Accepted requests session_accepted = session_accepted > lAccepted ? lAccepted : session_accepted; m_bar_accepted->SetValue( session_accepted ); wxString labelAcc = CFormat(wxT("%d / %d")) % session_accepted % all_accepted; diff --git a/src/StatTree.h b/src/StatTree.h index 48278391da..f8df3bc403 100644 --- a/src/StatTree.h +++ b/src/StatTree.h @@ -329,7 +329,7 @@ class CStatTreeItemBase //! Children of this node. std::list m_children; - //! Lock to protect list from simultanous access. + //! Lock to protect list from simultaneous access. wxMutex m_lock; }; diff --git a/src/StateMachine.cpp b/src/StateMachine.cpp index 7d28c5449a..29fda863ca 100644 --- a/src/StateMachine.cpp +++ b/src/StateMachine.cpp @@ -54,7 +54,7 @@ void CStateMachine::Clock() old_state = m_state; - /* Process state change acording to event */ + /* Process state change according to event */ if (!m_queue.empty()) { event = m_queue.front(); m_queue.pop(); diff --git a/src/Statistics.h b/src/Statistics.h index d32818b923..4179289624 100644 --- a/src/Statistics.h +++ b/src/Statistics.h @@ -105,7 +105,7 @@ class CPreciseRateCounter { /** * Gets ever seen maximal rate. * - * @return The maximal rate which occured. + * @return The maximal rate which occurred. */ double GetMaxRate() { wxMutexLocker lock(m_mutex); return m_max_rate; } diff --git a/src/Tag.cpp b/src/Tag.cpp index 29475c4794..d1d703c370 100644 --- a/src/Tag.cpp +++ b/src/Tag.cpp @@ -131,7 +131,7 @@ CTag::CTag(const CFileDataIO& data, bool bOptUTF8) break; case TAGTYPE_FLOAT32: - //#warning Endianess problem? + //#warning Endianness problem? data.Read(&m_fVal, 4); break; @@ -176,7 +176,7 @@ CTag::CTag(const CFileDataIO& data, bool bOptUTF8) } else { // Since we cannot determine the length of this tag, we // simply have to abort reading the file. - throw CInvalidPacket(CFormat(wxT("Unknown tag type encounted %x, cannot proceed!")) % m_uType); + throw CInvalidPacket(CFormat(wxT("Unknown tag type encountered %x, cannot proceed!")) % m_uType); } } } catch (...) { @@ -364,7 +364,7 @@ bool CTag::WriteNewEd2kTag(CFileDataIO* data, EUtf8Str eStrEncode) const data->WriteUInt8(m_uVal); break; case TAGTYPE_FLOAT32: - //#warning Endianess problem? + //#warning Endianness problem? data->Write(&m_fVal, 4); break; case TAGTYPE_HASH16: diff --git a/src/ThreadScheduler.cpp b/src/ThreadScheduler.cpp index 99a7ace71b..bd03f0c883 100644 --- a/src/ThreadScheduler.cpp +++ b/src/ThreadScheduler.cpp @@ -35,7 +35,7 @@ static wxMutex s_lock; static CThreadScheduler* s_scheduler = NULL; //! Specifies if the scheduler is running. static bool s_running = false; -//! Specifies if the gobal scheduler has been terminated. +//! Specifies if the global scheduler has been terminated. static bool s_terminated = false; /** @@ -43,7 +43,7 @@ static bool s_terminated = false; * * The reason for not using wxThreadHelper are as follows: * - wxThreadHelper makes use of wxThread:Kill, which is warned against - * serveral times in the docs, and even calls it in its destructor. + * several times in the docs, and even calls it in its destructor. * - Managing the thread-object is difficult, since the only way to * destroy it is to create a new thread. */ @@ -299,7 +299,7 @@ void* CThreadScheduler::Entry() // If the task has been aborted, the entry now refers to // a different task, so dont remove it. That also means - // that it cant be the last task of this type. + // that it can't be the last task of this type. if (!task->m_abort) { AddDebugLogLineN(logThreads, CFormat(wxT("Completed task '%s%s', %u tasks remaining.")) diff --git a/src/ThreadScheduler.h b/src/ThreadScheduler.h index 99c47d5395..5b38b2bc92 100644 --- a/src/ThreadScheduler.h +++ b/src/ThreadScheduler.h @@ -188,7 +188,7 @@ class CThreadTask //! The owner (scheduler), used when calling TestDestroy. CMuleThread* m_owner; - //! Specifies if the specifc task should be aborted. + //! Specifies if the specific task should be aborted. bool m_abort; friend class CThreadScheduler; diff --git a/src/ThreadTasks.cpp b/src/ThreadTasks.cpp index 7e3f0536af..a8b75fb150 100644 --- a/src/ThreadTasks.cpp +++ b/src/ThreadTasks.cpp @@ -254,7 +254,7 @@ void CHashingTask::OnLastTask() { if (GetType() == wxT("Hashing")) { // To prevent rehashing in case of crashes, we - // explicity save the list of hashed files here. + // explicitly save the list of hashed files here. theApp->knownfiles->Save(); // Make sure the AICH-hashes are up to date. @@ -267,7 +267,7 @@ void CHashingTask::OnLastTask() // CAICHSyncTask CAICHSyncTask::CAICHSyncTask() - : CThreadTask(wxT("AICH Syncronizing"), wxEmptyString, ETP_Low) + : CThreadTask(wxT("AICH Synchronizing"), wxEmptyString, ETP_Low) { } @@ -276,7 +276,7 @@ void CAICHSyncTask::Entry() { ConvertToKnown2ToKnown264(); - AddDebugLogLineN( logAICHThread, wxT("Syncronization thread started.") ); + AddDebugLogLineN( logAICHThread, wxT("Synchronization thread started.") ); // We collect all masterhashs which we find in the known2.met and store them in a list std::list hashlist; @@ -429,7 +429,7 @@ void CCompletionTask::Entry() { #ifndef AMULE_DAEMON - // Prevent the preference values from changing underneeth us. + // Prevent the preference values from changing underneath us. wxMutexGuiLocker guiLock; #else //#warning Thread-safety needed diff --git a/src/ThreadTasks.h b/src/ThreadTasks.h index 732f4206f0..b8592d9c6d 100644 --- a/src/ThreadTasks.h +++ b/src/ThreadTasks.h @@ -165,7 +165,7 @@ class CCompletionTask : public CThreadTask uint8 m_category; //! Owner of the file, used when sending completion-event. const CPartFile* m_owner; - //! Specifies if an error occured during completion. + //! Specifies if an error occurred during completion. bool m_error; //! The resulting full path. File may be be renamed. CPath m_newName; diff --git a/src/Timer.h b/src/Timer.h index 73b1356deb..064d49b0cc 100644 --- a/src/Timer.h +++ b/src/Timer.h @@ -57,7 +57,7 @@ class CTimer * Stops the timer. * * Note that this does not delete the actual thread - * immediatly, but no new events will be queued after + * immediately, but no new events will be queued after * calling this function. */ void Stop(); diff --git a/src/UPnPBase.cpp b/src/UPnPBase.cpp index 7e75084094..a95e6cc16c 100644 --- a/src/UPnPBase.cpp +++ b/src/UPnPBase.cpp @@ -1643,7 +1643,7 @@ void CUPnPControlPoint::Subscribe(CUPnPService &service) msg.str(""); // Now try to subscribe to this service. If the subscription - // is not successfull, we will not be notified about events, + // is not successful, we will not be notified about events, // but it may be possible to use the service anyway. errcode = UpnpSubscribe(m_UPnPClientHandle, service.GetAbsEventSubURL().c_str(), diff --git a/src/UploadBandwidthThrottler.cpp b/src/UploadBandwidthThrottler.cpp index 823c511f40..5f075fe6cc 100644 --- a/src/UploadBandwidthThrottler.cpp +++ b/src/UploadBandwidthThrottler.cpp @@ -57,7 +57,7 @@ UploadBandwidthThrottler::UploadBandwidthThrottler() /** - * The destructor stops the thread. If the thread has already stoppped, destructor does nothing. + * The destructor stops the thread. If the thread has already stopped, destructor does nothing. */ UploadBandwidthThrottler::~UploadBandwidthThrottler() { @@ -100,11 +100,11 @@ uint64 UploadBandwidthThrottler::GetNumberOfSentBytesOverheadSinceLastCallAndRes /** * Add a socket to the list of sockets that have upload slots. The main thread will - * continously call send on these sockets, to give them chance to work off their queues. + * continuously call send on these sockets, to give them chance to work off their queues. * The sockets are called in the order they exist in the list, so the top socket (index 0) * will be given a chance first to use bandwidth, and then the next socket (index 1) etc. * - * It is possible to add a socket several times to the list without removing it inbetween, + * It is possible to add a socket several times to the list without removing it in between, * but that should be avoided. * * @param index insert the socket at this place in the list. An index that is higher than the diff --git a/src/UploadClient.cpp b/src/UploadClient.cpp index 5c719cbcc8..e6db2134dd 100644 --- a/src/UploadClient.cpp +++ b/src/UploadClient.cpp @@ -248,7 +248,7 @@ void CUpDownClient::CreateNextBlockPackage() SetUploadFileID(srcfile); - // check extention to decide whether to compress or not + // check extension to decide whether to compress or not if (m_byDataCompVer == 1 && GetFiletype(srcfile->GetFileName()) != ftArchive) { CreatePackedPackets(area.GetBuffer(), togo, currentblock); } else { @@ -277,7 +277,7 @@ void CUpDownClient::CreateNextBlockPackage() AddDebugLogLineN(logClient, GetClientFullInfo() + wxT(" requested file-data at an invalid position - disconnecting")); } - // Error occured. + // Error occurred. theApp->uploadqueue->RemoveFromUploadQueue(this); } @@ -651,7 +651,7 @@ void CUpDownClient::SendOutOfPartReqsAndAddToWaitingQueue() //the downloader didn't send any request blocks. Then the connection times out.. //I did some tests with eDonkey also and it seems to work well with them also.. - // Send this inmediately, don't queue. + // Send this immediately, don't queue. CPacket* pPacket = new CPacket(OP_OUTOFPARTREQS, 0, OP_EDONKEYPROT); theStats::AddUpOverheadFileRequest(pPacket->GetPacketSize()); AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_OUTOFPARTREQS to ") + GetFullIP() ); @@ -796,7 +796,7 @@ void CUpDownClient::CheckForAggressive() { uint32 cur_time = ::GetTickCount(); - // First call, initalize + // First call, initialize if ( !m_LastFileRequest ) { m_LastFileRequest = cur_time; return; diff --git a/src/UploadQueue.cpp b/src/UploadQueue.cpp index 23e375864c..b0009abc95 100644 --- a/src/UploadQueue.cpp +++ b/src/UploadQueue.cpp @@ -239,7 +239,7 @@ void CUploadQueue::Process() uint32 tick = GetTickCount(); // Nobody waiting or upload started recently // (Actually instead of "empty" it should check for "no HighID clients queued", - // but the cost for that outweights the benefit. As it is, a slot will be freed + // but the cost for that outweighs the benefit. As it is, a slot will be freed // even if it can't be taken because all of the queue is LowID. But just one, // and the kicked client will instantly get it back if he has HighID.) // Also, if we are running out of sockets, don't add new clients, but also don't kick existing ones, @@ -600,10 +600,10 @@ void CUploadQueue::ResumeUpload( const CMD4Hash& filehash ) /* * This function stops upload of a file indicated by filehash. * - * a) teminate == false: + * a) terminate == false: * File is suspended while a download completes. Then it is resumed after completion, * so it makes sense to keep the client. Such files are kept in suspendedUploadsSet. - * b) teminate == true: + * b) terminate == true: * File is deleted. Then the client is not added to the waiting list. * Waiting clients are swept out with next run of AddUpNextClient, * because their file is not shared anymore. diff --git a/src/UserEvents.h b/src/UserEvents.h index 541a0717e0..0f26dc721c 100644 --- a/src/UserEvents.h +++ b/src/UserEvents.h @@ -139,7 +139,7 @@ class CUserEvents { static unsigned int GetCount() ATTR(__const__); /** - * Returs the human-readable name of the event. + * Returns the human-readable name of the event. */ static const wxString& GetDisplayName(enum EventType event) ATTR(__pure__); diff --git a/src/amule-gui.cpp b/src/amule-gui.cpp index e1cf577060..e33bfa0117 100644 --- a/src/amule-gui.cpp +++ b/src/amule-gui.cpp @@ -140,7 +140,7 @@ int CamuleGuiBase::InitGui(bool geometry_enabled, wxString &geom_string) long width = geometry_width; long height = geometry_height; - // Get the avilable display area + // Get the available display area wxRect display = wxGetClientDisplayRect(); // We want to place aMule inside the client area by default diff --git a/src/amule-remote-gui.h b/src/amule-remote-gui.h index 26bc1e3a7b..1bf5667e8a 100644 --- a/src/amule-remote-gui.h +++ b/src/amule-remote-gui.h @@ -253,7 +253,7 @@ class CRemoteContainer : public CECPacketHandlerBase { } // - // Following are like basicly same code as in webserver. Eventually it must + // Following are like basically same code as in webserver. Eventually it must // be same class // void DoRequery(int cmd, int tag) diff --git a/src/amule.cpp b/src/amule.cpp index 478ba81cc0..c4608eeaea 100644 --- a/src/amule.cpp +++ b/src/amule.cpp @@ -206,7 +206,7 @@ CamuleApp::CamuleApp() enable_daemon_fork = false; - // Apprently needed for *BSD + // Apparently needed for *BSD SetResourceLimits(); #ifdef _MSC_VER @@ -332,7 +332,7 @@ int CamuleApp::OnExit() #if wxUSE_MEMORY_TRACING AddLogLineNS(_("Memory debug results for aMule exit:")); - // Log mem debug mesages to wxLogStderr + // Log mem debug messages to wxLogStderr wxLog* oldLog = wxLog::SetActiveTarget(new wxLogStderr); //AddLogLineNS(wxT("**************Classes**************"); //wxDebugContext::PrintClasses(); @@ -347,7 +347,7 @@ int CamuleApp::OnExit() StopTickTimer(); - // Return 0 for succesful program termination + // Return 0 for successful program termination return AMULE_APP_BASE::OnExit(); } @@ -484,7 +484,7 @@ bool CamuleApp::OnInit() } } - // We havent run this version before? + // We haven't run this version before? if ( !found ) { // Insert new at top to provide faster searches vfile.InsertLine( newMule, 0 ); @@ -492,7 +492,7 @@ bool CamuleApp::OnInit() Trigger_New_version( newMule ); } - // Keep at most 10 entires + // Keep at most 10 entries while ( vfile.GetLineCount() > 10 ) vfile.RemoveLine( vfile.GetLineCount() - 1 ); @@ -760,7 +760,7 @@ bool CamuleApp::ReinitializeNetwork(wxString* msg) *msg << CFormat( wxT("*** TCP socket (TCP) listening on %s:%u\n") ) % ip % (unsigned int)(thePrefs::GetPort()); // Notify(true) has already been called to the ListenSocket, so events may - // be already comming in. + // be already coming in. if (!listensocket->IsOk()) { // If we wern't able to start listening, we need to warn the user wxString err; @@ -1250,7 +1250,7 @@ void CamuleApp::OnCoreTimer(CTimerEvent& WXUNUSED(evt)) } - // Recomended by lugdunummaster himself - from emule 0.30c + // Recommended by lugdunummaster himself - from emule 0.30c serverconnect->KeepConnectionAlive(); // Disarm recursion protection @@ -1784,7 +1784,7 @@ bool CamuleApp::CanDoCallback(uint32 clientServerIP, uint16 clientServerPort) //Only Kad Connected - Kad Firewalled return false; } else { - //Only Kad Conected - Kad Open + //Only Kad Connected - Kad Open return true; } } @@ -1839,7 +1839,7 @@ void CamuleApp::ListenSocketHandler(wxSocketEvent& event) listensocket->OnAccept(); } else if (m_app_state == APP_STATE_STARTING) { // When starting up, connection may be made before we are able - // to handle them. However, if these are ignored, no futher + // to handle them. However, if these are ignored, no further // connection-events will be triggered, so we have to accept it. CLibSocket* socket = listensocket->Accept(false); @@ -2049,7 +2049,7 @@ uint32 CamuleApp::GetID() const { } else if( theApp->serverconnect->IsConnected() ) { ID = theApp->serverconnect->GetClientID(); } else if ( Kademlia::CKademlia::IsConnected() && Kademlia::CKademlia::IsFirewalled() ) { - // A firewalled Kad client get's a "1" + // A firewalled Kad client gets a "1" ID = 1; } else { ID = 0; diff --git a/src/amule.h b/src/amule.h index 5ded928716..03894d526b 100644 --- a/src/amule.h +++ b/src/amule.h @@ -551,7 +551,7 @@ class CamuleDaemonApp : public CamuleApp // does not, leaving wxConvFile being set to wxConvLibc. File // name conversion should be set otherwise amuled will abort to // handle non-ASCII file names which monolithic amule can handle. - // This function are overrided to perform this. + // This function are overridden to perform this. virtual bool Initialize(int& argc_, wxChar **argv_); #ifdef AMULED_APPTRAITS diff --git a/src/amuleAppCommon.cpp b/src/amuleAppCommon.cpp index e9773b310e..0083d180dd 100644 --- a/src/amuleAppCommon.cpp +++ b/src/amuleAppCommon.cpp @@ -24,7 +24,7 @@ // // This file is for functions common to all three apps (amule, amuled, amulegui), -// but preprocessor-dependent (using theApp, thePrefs), so it is compiled seperately for each app. +// but preprocessor-dependent (using theApp, thePrefs), so it is compiled separately for each app. // @@ -231,7 +231,7 @@ bool CamuleAppCommon::InitCommon(int argc, wxChar ** argv) #else #ifdef __WINDOWS__ - // MSW shows help otions in a dialog box, and the formatting doesn't fit there + // MSW shows help options in a dialog box, and the formatting doesn't fit there #define HELPTAB wxT("\t") #else #define HELPTAB wxT("\t\t\t") diff --git a/src/amuleDlg.cpp b/src/amuleDlg.cpp index be147f622a..0cdbec9924 100644 --- a/src/amuleDlg.cpp +++ b/src/amuleDlg.cpp @@ -1323,7 +1323,7 @@ void CamuleDlg::Apply_Toolbar_Skin(wxToolBar *wndToolbar) wndToolbar->ToggleTool(ID_BUTTONDOWNLOADS, true); // Needed for non-GTK platforms, where the - // items don't get added immediatly. + // items don't get added immediately. wndToolbar->Realize(); // Updates the "Connect" button, and so on. diff --git a/src/amuleDlg.h b/src/amuleDlg.h index 8eef3cc590..f01051723d 100644 --- a/src/amuleDlg.h +++ b/src/amuleDlg.h @@ -138,7 +138,7 @@ class CamuleDlg : public wxFrame void SetActiveDialog(DialogType type, wxWindow* dlg); /** - * Helper function for deciding if a certian dlg is visible. + * Helper function for deciding if a certain dlg is visible. * * @return True if the dialog is visible to the user, false otherwise. */ diff --git a/src/amuled.cpp b/src/amuled.cpp index f631230a50..dedc46fea4 100644 --- a/src/amuled.cpp +++ b/src/amuled.cpp @@ -591,7 +591,7 @@ int CamuleDaemonApp::OnRun() AddLogLineCS(_("ERROR: aMule daemon cannot be used when external connections are disabled. To enable External Connections, use either a normal aMule, start amuled with the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in the file ~/.aMule/amule.conf")); return 0; } else if (thePrefs::ECPassword().IsEmpty()) { - AddLogLineCS(_("ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule deamon, you must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an appropriate value. Execute amuled with the flag --ec-config to set the password. More information can be found at http://wiki.amule.org")); + AddLogLineCS(_("ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, you must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an appropriate value. Execute amuled with the flag --ec-config to set the password. More information can be found at http://wiki.amule.org")); return 0; } @@ -602,7 +602,7 @@ int CamuleDaemonApp::OnRun() #ifdef AMULED_APPTRAITS // Process the return code of dead children so that we do not create // zombies. wxBase does not implement wxProcess callbacks, so no one - // actualy calls wxHandleProcessTermination() in console applications. + // actually calls wxHandleProcessTermination() in console applications. // We do our best here. DEBUG_ONLY( int ret = 0; ) DEBUG_ONLY( ret = ) sigaction(SIGCHLD, NULL, &m_oldSignalChildAction); @@ -633,7 +633,7 @@ int CamuleDaemonApp::OnRun() #endif } - // ShutDown is beeing called twice. Once here and again in OnExit(). + // ShutDown is being called twice. Once here and again in OnExit(). ShutDown(); return 0; diff --git a/src/extern/wxWidgets/listctrl.cpp b/src/extern/wxWidgets/listctrl.cpp index b64af86250..3cf5ebaa61 100644 --- a/src/extern/wxWidgets/listctrl.cpp +++ b/src/extern/wxWidgets/listctrl.cpp @@ -2554,7 +2554,7 @@ void wxListMainWindow::HighlightLines( size_t lineFrom, if ( !m_selStore.SelectRange(lineFrom, lineTo, highlight, &linesChanged) ) { - // meny items changed state, refresh everything + // many items changed state, refresh everything RefreshLines(lineFrom, lineTo); } else // only a few items changed state, refresh only them @@ -3930,8 +3930,8 @@ void wxListMainWindow::SetItemStateAll(long state, long stateMask) if ( HasCurrent() && (state == 0) && (stateMask & wxLIST_STATE_FOCUSED) ) { - // unfocus all: only one item can be focussed, so clearing focus for - // all items is simply clearing focus of the focussed item. + // unfocus all: only one item can be focused, so clearing focus for + // all items is simply clearing focus of the focused item. SetItemState(m_current, state, stateMask); } //(setting focus to all items makes no sense, so it is not handled here.) @@ -4093,7 +4093,7 @@ int wxListMainWindow::GetSelectedItemCount() const if ( IsSingleSel() ) return HasCurrent() ? IsHighlighted(m_current) : false; - // virtual controls remmebers all its selections itself + // virtual controls remembers all its selections itself if ( IsVirtual() ) return m_selStore.GetSelectedCount(); diff --git a/src/extern/wxWidgets/listctrl.h b/src/extern/wxWidgets/listctrl.h index b62204cc0e..1db64b2ff6 100644 --- a/src/extern/wxWidgets/listctrl.h +++ b/src/extern/wxWidgets/listctrl.h @@ -94,7 +94,7 @@ class wxGenericListCtrl: public wxControl #endif // wxABI 2.8.4+ // It is not certain that sizeof(long) == sizeof(void*), and since we -// just about only use pointers as item-data, I've choosen to disable +// just about only use pointers as item-data, I've chosen to disable // this function to prevent mistakes. Use SetItemPtrData instead. #if 0 bool SetItemData(long item, long data); diff --git a/src/include/protocol/ed2k/Constants.h b/src/include/protocol/ed2k/Constants.h index a872f2e4b1..a888cd0c5a 100644 --- a/src/include/protocol/ed2k/Constants.h +++ b/src/include/protocol/ed2k/Constants.h @@ -31,7 +31,7 @@ // MOD Note: Do not change this part - Merkur // Timeouts & Reask times -#define CONNECTION_TIMEOUT 40000 // set this lower if you want less connections at once, set it higher if you have enough sockets (edonkey has its own timout too, so a very high value won't effect this) +#define CONNECTION_TIMEOUT 40000 // set this lower if you want less connections at once, set it higher if you have enough sockets (edonkey has its own timeout too, so a very high value won't effect this) #define FILEREASKTIME 1300000 // 1300000 <- original value *** #define SERVERREASKTIME 800000 // don't set this too low, it wont speed up anything, but it could kill amule or your internetconnection #define UDPSERVERREASKTIME 1300000 // 1300000 <- original value *** @@ -67,7 +67,7 @@ #define MIN_REQUESTTIME 590000 #define MAX_PURGEQUEUETIME HR2MS(1) #define PURGESOURCESWAPSTOP MIN2MS(15) // How long forbid swapping a source to a certain file (NNP,...) -#define CONNECTION_LATENCY 22050 // latency for responces +#define CONNECTION_LATENCY 22050 // latency for responses #define CLIENTBANTIME HR2MS(2) // 2h #define TRACKED_CLEANUP_TIME HR2MS(1) #define KEEPTRACK_TIME HR2MS(2) // how long to keep track of clients which were once in the uploadqueue diff --git a/src/kademlia/kademlia/Defines.h b/src/kademlia/kademlia/Defines.h index abaf77b746..0357845d15 100644 --- a/src/kademlia/kademlia/Defines.h +++ b/src/kademlia/kademlia/Defines.h @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/kademlia/Entry.cpp b/src/kademlia/kademlia/Entry.cpp index 3c7e800d05..e184395507 100644 --- a/src/kademlia/kademlia/Entry.cpp +++ b/src/kademlia/kademlia/Entry.cpp @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. @@ -121,9 +121,9 @@ void CEntry::SetFileName(const wxString& name) wxString CEntry::GetCommonFileName() const { // return the filename on which most publishers seem to agree on - // due to the counting, this doesn't has to be excact, we just want to make sure to not use a filename which just + // due to the counting, this doesn't has to be exact, we just want to make sure to not use a filename which just // a few bad publishers used and base or search matching and answering on this, instead of the most popular name - // Note: The Index values are not the acutal numbers of publishers, but just a relativ number to compare to other entries + // Note: The Index values are not the actual numbers of publishers, but just a relative number to compare to other entries FileNameList::const_iterator result = m_filenames.end(); uint32_t highestPopularityIndex = 0; for (FileNameList::const_iterator it = m_filenames.begin(); it != m_filenames.end(); ++it) { @@ -363,7 +363,7 @@ void CKeyEntry::MergeIPsAndFilenames(CKeyEntry* fromEntry) bool refresh = false; if (fromEntry == NULL || fromEntry->m_publishingIPs == NULL) { wxASSERT(fromEntry == NULL); - // if called with NULL, this is a complete new entry and we need to initalize our lists + // if called with NULL, this is a complete new entry and we need to initialize our lists if (m_publishingIPs == NULL) { m_publishingIPs = new PublishingIPList(); } @@ -446,7 +446,7 @@ void CKeyEntry::ReCalculateTrustValue() // but mostly we say everything below 1 is bad, everything above 1 is good. It is calculated by looking at how many different // IPs/24 have published this entry and how many entries each of those IPs have. // Each IP/24 has x (say 3) points. This means if one IP publishes 3 different entries without any other IP publishing those entries, - // each of those entries will have 3 / 3 = 1 Trustvalue. Thats fine. If it publishes 6 alone, each entry has 3 / 6 = 0.5 trustvalue - not so good + // each of those entries will have 3 / 3 = 1 Trustvalue. That's fine. If it publishes 6 alone, each entry has 3 / 6 = 0.5 trustvalue - not so good // However if there is another publisher for entry 5, which only publishes this entry then we have 3/6 + 3/1 = 3.5 trustvalue for this entry // // What's the point? With this rating we try to avoid getting spammed with entries for a given keyword by a small IP range, which blends out @@ -479,7 +479,7 @@ void CKeyEntry::ReCalculateTrustValue() double CKeyEntry::GetTrustValue() { - // update if last calcualtion is too old, will assert if this entry is not supposed to have a trustvalue + // update if last calculation is too old, will assert if this entry is not supposed to have a trustvalue if (::GetTickCount() - m_lastTrustValueCalc > MIN2MS(10)) { ReCalculateTrustValue(); } diff --git a/src/kademlia/kademlia/Entry.h b/src/kademlia/kademlia/Entry.h index de60532adc..8dec4f97b5 100644 --- a/src/kademlia/kademlia/Entry.h +++ b/src/kademlia/kademlia/Entry.h @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/kademlia/Error.h b/src/kademlia/kademlia/Error.h index 8a74cd4fac..0729184a3e 100644 --- a/src/kademlia/kademlia/Error.h +++ b/src/kademlia/kademlia/Error.h @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/kademlia/Indexed.cpp b/src/kademlia/kademlia/Indexed.cpp index 13e8893ce8..f79b76ae61 100644 --- a/src/kademlia/kademlia/Indexed.cpp +++ b/src/kademlia/kademlia/Indexed.cpp @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/kademlia/Indexed.h b/src/kademlia/kademlia/Indexed.h index 627728fe8a..7d9d656c5b 100644 --- a/src/kademlia/kademlia/Indexed.h +++ b/src/kademlia/kademlia/Indexed.h @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/kademlia/Kademlia.cpp b/src/kademlia/kademlia/Kademlia.cpp index b6edfcc2c8..8d34580e4a 100644 --- a/src/kademlia/kademlia/Kademlia.cpp +++ b/src/kademlia/kademlia/Kademlia.cpp @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. @@ -450,7 +450,7 @@ uint32_t CKademlia::CalculateKadUsersNew() } float newRatio = CKademlia::GetPrefs()->StatsGetKadV8Ratio(); float firewalledModifyTotal = 0.0; - if (newRatio > 0 && firewalledModifyNew > 0) { // weigth the old and the new modifier based on how many new contacts we have + if (newRatio > 0 && firewalledModifyNew > 0) { // weigh the old and the new modifier based on how many new contacts we have firewalledModifyTotal = (newRatio * firewalledModifyNew) + ((1 - newRatio) * firewalledModifyOld); } else { firewalledModifyTotal = firewalledModifyOld; diff --git a/src/kademlia/kademlia/Kademlia.h b/src/kademlia/kademlia/Kademlia.h index 54c63c8cb7..4b9a2727e1 100644 --- a/src/kademlia/kademlia/Kademlia.h +++ b/src/kademlia/kademlia/Kademlia.h @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/kademlia/Prefs.cpp b/src/kademlia/kademlia/Prefs.cpp index c710cf919e..f646c385cb 100644 --- a/src/kademlia/kademlia/Prefs.cpp +++ b/src/kademlia/kademlia/Prefs.cpp @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. @@ -149,7 +149,7 @@ void CPrefs::SetIPAddress(uint32_t val) throw() } //If the last check matches this one, reset our current IP. //If the last check does not match, wait for our next incoming IP. - //This happens for two reasons.. We just changed our IP, or a client responsed with a bad IP. + //This happens for two reasons.. We just changed our IP, or a client responded with a bad IP. if ( val == m_ipLast ) { m_ip = val; } else { diff --git a/src/kademlia/kademlia/Prefs.h b/src/kademlia/kademlia/Prefs.h index 60433c0736..221496842a 100644 --- a/src/kademlia/kademlia/Prefs.h +++ b/src/kademlia/kademlia/Prefs.h @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/kademlia/Search.cpp b/src/kademlia/kademlia/Search.cpp index e60a3547be..fbb63f02c9 100644 --- a/src/kademlia/kademlia/Search.cpp +++ b/src/kademlia/kademlia/Search.cpp @@ -31,7 +31,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. @@ -1031,12 +1031,12 @@ void CSearch::ProcessResultKeyword(const CUInt128& answer, TagPtrList *info) codec = tag->GetStr(); } else if (tag->GetName() == TAG_SOURCES) { availability = tag->GetInt(); - // Some rouge client was setting a invalid availability, just set it to 0. + // Some rogue client was setting a invalid availability, just set it to 0. if( availability > 65500 ) { availability = 0; } } else if (tag->GetName() == TAG_PUBLISHINFO) { - // we don't keep this as tag, but as a member property of the searchfile, as we only need its informations + // we don't keep this as tag, but as a member property of the searchfile, as we only need its information // in the search list and don't want to carry the tag over when downloading the file (and maybe even wrongly publishing it) publishInfo = (uint32_t)tag->GetInt(); #ifdef __DEBUG__ diff --git a/src/kademlia/kademlia/Search.h b/src/kademlia/kademlia/Search.h index f781c8606a..59bb0b2eaf 100644 --- a/src/kademlia/kademlia/Search.h +++ b/src/kademlia/kademlia/Search.h @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/kademlia/SearchManager.cpp b/src/kademlia/kademlia/SearchManager.cpp index f9ee9248a1..68b4cb5381 100644 --- a/src/kademlia/kademlia/SearchManager.cpp +++ b/src/kademlia/kademlia/SearchManager.cpp @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/kademlia/SearchManager.h b/src/kademlia/kademlia/SearchManager.h index 86598687ec..cb76b33a0b 100644 --- a/src/kademlia/kademlia/SearchManager.h +++ b/src/kademlia/kademlia/SearchManager.h @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/kademlia/UDPFirewallTester.cpp b/src/kademlia/kademlia/UDPFirewallTester.cpp index ab1f6f1409..892a81bd44 100644 --- a/src/kademlia/kademlia/UDPFirewallTester.cpp +++ b/src/kademlia/kademlia/UDPFirewallTester.cpp @@ -60,7 +60,7 @@ bool CUDPFirewallTester::IsFirewalledUDP(bool lastStateIfTesting) } if (!m_timedOut && IsFWCheckUDPRunning()) { if (!m_firewalledUDP && CKademlia::IsFirewalled() && m_testStart != 0 && ::GetTickCount() - m_testStart > MIN2MS(6) - && !m_isFWVerifiedUDP /*For now we don't allow to get firewalled by timeouts if we have succeded a test before, might be changed later*/) + && !m_isFWVerifiedUDP /*For now we don't allow to get firewalled by timeouts if we have succeeded a test before, might be changed later*/) { AddDebugLogLineN(logKadUdpFwTester, wxT("Timeout: Setting UDP status to firewalled after being unable to get results for 6 minutes")); m_timedOut = true; @@ -95,7 +95,7 @@ void CUDPFirewallTester::SetUDPFWCheckResult(bool succeeded, bool testCancelled, if (!IsFWCheckUDPRunning() && !m_firewalledUDP && m_isFWVerifiedUDP && m_lastSucceededTime + SEC2MS(10) > ::GetTickCount() && incomingPort == CKademlia::GetPrefs()->GetInternKadPort() && CKademlia::GetPrefs()->GetUseExternKadPort()) { // our test finished already in the last 10 seconds with being open because we received a proper result packet before - // however we now receive another answer packet on our incoming port (which is not unusal as both resultpackets are sent + // however we now receive another answer packet on our incoming port (which is not unusual as both resultpackets are sent // nearly at the same time and UDP doesn't cares if the order stays), while the one before was received on our extern port // Because a proper forwarded intern port is more reliable to stay open than an extern port set by the NAT, we prefer // intern ports and change the setting. @@ -142,7 +142,7 @@ void CUDPFirewallTester::SetUDPFWCheckResult(bool succeeded, bool testCancelled, m_fwChecksRunningUDP = 0; // all other tests are cancelled m_possibleTestClients.clear(); // clear list, keep used clients list though CSearchManager::CancelNodeFWCheckUDPSearch(); // cancel firewallnode searches if any are still active - // if this packet came to our internal port, explict set the interal port as used port from now on + // if this packet came to our internal port, explicitly set the internal port as used port from now on if (incomingPort == CKademlia::GetPrefs()->GetInternKadPort()) { CKademlia::GetPrefs()->SetUseExternKadPort(false); AddDebugLogLineN(logKadUdpFwTester, wxT("New Kad Firewallstate (UDP): Open, using intern port")); diff --git a/src/kademlia/net/KademliaUDPListener.cpp b/src/kademlia/net/KademliaUDPListener.cpp index 16e91c7192..11105ec4ac 100644 --- a/src/kademlia/net/KademliaUDPListener.cpp +++ b/src/kademlia/net/KademliaUDPListener.cpp @@ -26,7 +26,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. @@ -162,7 +162,7 @@ void CKademliaUDPListener::SendMyDetails(uint8_t opcode, uint32_t ip, uint16_t p void CKademliaUDPListener::FirewalledCheck(uint32_t ip, uint16_t port, const CKadUDPKey& senderKey, uint8_t kadVersion) { if (kadVersion > 6) { - // new opcode since 0.49a with extended informations to support obfuscated connections properly + // new opcode since 0.49a with extended information to support obfuscated connections properly CMemFile packetdata(19); packetdata.WriteUInt16(thePrefs::GetPort()); packetdata.WriteUInt128(CKademlia::GetPrefs()->GetClientHash()); @@ -416,7 +416,7 @@ bool CKademliaUDPListener::AddContact2(const uint8_t *data, uint32_t lenData, ui --tags; } - // check if we are waiting for informations (nodeid) about this client and if so inform the requester + // check if we are waiting for information (nodeid) about this client and if so inform the requester for (FetchNodeIDList::iterator it = m_fetchNodeIDRequests.begin(); it != m_fetchNodeIDRequests.end(); ++it) { if (it->ip == ip && it->tcpPort == tport) { //AddDebugLogLineN(logKadMain, wxT("Result Addcontact: ") + id.ToHexString()); @@ -735,7 +735,7 @@ void CKademliaUDPListener::ProcessKademlia2Response(const uint8_t *packetData, u // UDP FirewallCheck searches are special. The point is we need an IP which we didn't sent a UDP message yet // (or in the near future), so we do not try to add those contacts to our routingzone and we also don't // deliver them back to the searchmanager (because he would UDP-ask them for further results), but only report - // them to FirewallChecker - this will of course cripple the search but thats not the point, since we only + // them to FirewallChecker - this will of course cripple the search but that's not the point, since we only // care for IPs and not the random set target CUDPFirewallTester::AddPossibleTestContact(id, contactIP, contactPort, tport, target, version, 0, false); } else { diff --git a/src/kademlia/net/KademliaUDPListener.h b/src/kademlia/net/KademliaUDPListener.h index 02da925fc8..8cc4502400 100644 --- a/src/kademlia/net/KademliaUDPListener.h +++ b/src/kademlia/net/KademliaUDPListener.h @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/routing/Contact.cpp b/src/kademlia/routing/Contact.cpp index d23947914f..44a2e86940 100644 --- a/src/kademlia/routing/Contact.cpp +++ b/src/kademlia/routing/Contact.cpp @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/routing/Contact.h b/src/kademlia/routing/Contact.h index de98012980..d3b84f157e 100644 --- a/src/kademlia/routing/Contact.h +++ b/src/kademlia/routing/Contact.h @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/routing/Maps.h b/src/kademlia/routing/Maps.h index 1fcb3a29c5..695fdcaafb 100644 --- a/src/kademlia/routing/Maps.h +++ b/src/kademlia/routing/Maps.h @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/routing/RoutingBin.cpp b/src/kademlia/routing/RoutingBin.cpp index 9373eac34f..b06c5e104e 100644 --- a/src/kademlia/routing/RoutingBin.cpp +++ b/src/kademlia/routing/RoutingBin.cpp @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. @@ -270,7 +270,7 @@ bool CRoutingBin::ChangeContactIPAddress(CContact *contact, uint32_t newIP) { // Called if we want to update an indexed contact with a new IP. We have to check if we actually allow such a change // and if adjust our tracking. Rejecting a change will in the worst case lead a node contact to become invalid and purged later, - // but it also protects against a flood of malicous update requests from one IP which would be able to "reroute" all + // but it also protects against a flood of malicious update requests from one IP which would be able to "reroute" all // contacts to itself and by that making them useless if (contact->GetIPAddress() == newIP) { return true; diff --git a/src/kademlia/routing/RoutingBin.h b/src/kademlia/routing/RoutingBin.h index 271a90b1fa..51d02b5b9f 100644 --- a/src/kademlia/routing/RoutingBin.h +++ b/src/kademlia/routing/RoutingBin.h @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/routing/RoutingZone.cpp b/src/kademlia/routing/RoutingZone.cpp index 388709093b..86675595a1 100644 --- a/src/kademlia/routing/RoutingZone.cpp +++ b/src/kademlia/routing/RoutingZone.cpp @@ -31,7 +31,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. @@ -257,7 +257,7 @@ void CRoutingZone::ReadBootstrapNodesDat(CFileDataIO& file) CUInt128 distance = me; distance ^= id; validContacts++; - // don't bother if we already have 50 and the farest distance is smaller than this contact + // don't bother if we already have 50 and the farthest distance is smaller than this contact if (CKademlia::s_bootstrapList.size() < 50 || CKademlia::s_bootstrapList.back()->GetDistance() > distance) { // look where to put this contact into the proper position bool inserted = false; diff --git a/src/kademlia/routing/RoutingZone.h b/src/kademlia/routing/RoutingZone.h index 7fc4802035..69c07d5e13 100644 --- a/src/kademlia/routing/RoutingZone.h +++ b/src/kademlia/routing/RoutingZone.h @@ -30,7 +30,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/utils/UInt128.cpp b/src/kademlia/utils/UInt128.cpp index 2a47fed59a..cff41bc103 100644 --- a/src/kademlia/utils/UInt128.cpp +++ b/src/kademlia/utils/UInt128.cpp @@ -32,7 +32,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/kademlia/utils/UInt128.h b/src/kademlia/utils/UInt128.h index 46efb816bb..b3391888cf 100644 --- a/src/kademlia/utils/UInt128.h +++ b/src/kademlia/utils/UInt128.h @@ -31,7 +31,7 @@ Please do not change anything here and release it.. There is going to be a new forum created just for the Kademlia side of the client.. If you feel there is an error or a way to improve something, please post it in the forum first and let us look at it.. If it is a real improvement, -it will be added to the offical client.. Changing something without knowing +it will be added to the official client.. Changing something without knowing what all it does can cause great harm to the network if released in mass form.. Any mod that changes anything within the Kademlia side will not be allowed to advertise there client on the eMule forum.. diff --git a/src/libs/common/FileFunctions.cpp b/src/libs/common/FileFunctions.cpp index b8f367cee6..4db0d12377 100644 --- a/src/libs/common/FileFunctions.cpp +++ b/src/libs/common/FileFunctions.cpp @@ -240,7 +240,7 @@ static bool UnpackGZipFile(const wxString& file) if (write) { target.Commit(); - // AddDebugLogLineN( logFileIO, wxT("Commited gzip stream") ); + // AddDebugLogLineN( logFileIO, wxT("Committed gzip stream") ); } return write; diff --git a/src/libs/common/Format.h b/src/libs/common/Format.h index aebe5be2d4..47235d9277 100644 --- a/src/libs/common/Format.h +++ b/src/libs/common/Format.h @@ -40,7 +40,7 @@ * - The @c "*" width-modifier, because only one argument is fed at a time. * - The @c "n" type, just unsafe and won't be implemented. * - The @c "C" and @c "S" types, which are considered obsolete. - * - The Long Double type, which is extremly slow and shouldn't be used. + * - The Long Double type, which is extremely slow and shouldn't be used. * * Support for the C99 @c a, @c A conversions and the non-standard @c ', @c I * flags depend on the underlying C library. Do not use them. diff --git a/src/libs/common/MuleDebug.cpp b/src/libs/common/MuleDebug.cpp index f04e375197..4b023815cf 100644 --- a/src/libs/common/MuleDebug.cpp +++ b/src/libs/common/MuleDebug.cpp @@ -59,7 +59,7 @@ /** * This functions displays a verbose description of - * any unhandled exceptions that occour and then + * any unhandled exceptions that occur and then * terminate the program by raising SIGABRT. */ void OnUnhandledException() diff --git a/src/libs/common/Path.cpp b/src/libs/common/Path.cpp index 0e162bbc3b..e27503c8d8 100644 --- a/src/libs/common/Path.cpp +++ b/src/libs/common/Path.cpp @@ -201,8 +201,8 @@ static bool IsSameAs(const wxString& a, const wxString& b) // Let wxFileName handle the tricky stuff involved in actually // comparing two paths ... Currently, a path ending with a path- - // seperator will be unequal to the same path without a path- - // seperator, which is probably for the best, but can could + // separator will be unequal to the same path without a path- + // separator, which is probably for the best, but can could // lead to some unexpected behavior. wxFileName fn1(a); wxFileName fn2(b); @@ -530,7 +530,7 @@ bool CPath::StartsWith(const CPath& other) const return false; } - // Adding an seperator to avoid partial matches, such as + // Adding an separator to avoid partial matches, such as // "/usr/bi" matching "/usr/bin". TODO: Paths should be // normalized first (in the constructor). const wxString a = StripSeparators(m_filesystem, wxString::trailing) + wxFileName::GetPathSeparator(); diff --git a/src/libs/common/Path.h b/src/libs/common/Path.h index de112bc412..6d4cce6b68 100644 --- a/src/libs/common/Path.h +++ b/src/libs/common/Path.h @@ -53,7 +53,7 @@ class CPath /** Default constructor. */ CPath(); - /** Constuctor. */ + /** Constructor. */ explicit CPath(const wxString& path); /** Copy constructor. Creates a deep-copy of the passed object. */ @@ -116,7 +116,7 @@ class CPath /** Returns the (raw) last extension, empty if none is found. */ wxString GetExt() const; - /** Returns the full path, exluding the filename. */ + /** Returns the full path, excluding the filename. */ CPath GetPath() const; /** Returns the full filename, excluding the path. */ CPath GetFullName() const; @@ -126,7 +126,7 @@ class CPath /** * Compares under the assumption that both objects are dirs, even if - * one or the other lacks a terminal directory-seperator. However, an + * one or the other lacks a terminal directory-separator. However, an * empty CPath object will not be considered equal to a path to the root. */ bool IsSameDir(const CPath& other) const; diff --git a/src/libs/common/StringFunctions.cpp b/src/libs/common/StringFunctions.cpp index 1aaf6f810c..76906b5b4c 100644 --- a/src/libs/common/StringFunctions.cpp +++ b/src/libs/common/StringFunctions.cpp @@ -164,7 +164,7 @@ enum ECharType { inline wxString GetNextField(const wxString& str, size_t& cookie) { - // These are taken to seperate "fields" + // These are taken to separate "fields" static const wxChar* s_delims = wxT("\t\n\x0b\x0c\r !\"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~"); wxString field; diff --git a/src/libs/common/StringFunctions.h b/src/libs/common/StringFunctions.h index 6814860ef7..e71e5b903e 100644 --- a/src/libs/common/StringFunctions.h +++ b/src/libs/common/StringFunctions.h @@ -127,7 +127,7 @@ inline char* nstrdup(const char* src) inline long StrToLong(const wxString& str) { long value = 0; - if (!str.ToLong(&value)) { // value may be changed even if it failes according to wx docu + if (!str.ToLong(&value)) { // value may be changed even if it fails according to wx docu value = 0; } return value; @@ -238,7 +238,7 @@ wxString validateURI(const wxString& url); * compared. This allows strings such as "a (2)" and "a (10)" to * be properly sorted for displaying. * - * Currently does not handle floats (they are treated as to seperate + * Currently does not handle floats (they are treated as to separate * fields, nor negative numbers. */ int FuzzyStrCmp(const wxString& a, const wxString& b); diff --git a/src/libs/common/TextFile.h b/src/libs/common/TextFile.h index f3bf1c570c..f42dba7bf5 100644 --- a/src/libs/common/TextFile.h +++ b/src/libs/common/TextFile.h @@ -111,10 +111,10 @@ class CTextFile bool WriteLine(const wxString& line, const wxMBConv& conv = wxConvLibc); - /** Reads and returns the contents of a text-file, using the specifed criteria and converter. */ + /** Reads and returns the contents of a text-file, using the specified criteria and converter. */ wxArrayString ReadLines(EReadTextFile flags = txtReadDefault, const wxMBConv& conv = wxConvLibc); - /** Writes the lines to the file, using the given converter, returning true if no errors occured. */ + /** Writes the lines to the file, using the given converter, returning true if no errors occurred. */ bool WriteLines(const wxArrayString& lines, const wxMBConv& conv = wxConvLibc); private: diff --git a/src/libs/ec/cpp/ECSocket.cpp b/src/libs/ec/cpp/ECSocket.cpp index 2454fe9dc9..eabbddf57e 100644 --- a/src/libs/ec/cpp/ECSocket.cpp +++ b/src/libs/ec/cpp/ECSocket.cpp @@ -437,7 +437,7 @@ void CECSocket::OnOutput() // Event driven logic: return, OnOutput() will be called again later return; } - // Syncronous call: wait (for max 10 secs) + // Synchronous call: wait (for max 10 secs) if ( !WaitSocketWrite(10, 0) ) { // Still not through ? if (WouldBlock()) { @@ -550,7 +550,7 @@ bool CECSocket::ReadHeader() // b) way too large (free data again after receiving huge packets) || m_bytes_needed + EC_SOCKET_BUFFER_SIZE * 10 < currLength) { // Client socket: IsAuthorized() is always true - // Server socket: do not allow growing of internal buffers before succesfull login. + // Server socket: do not allow growing of internal buffers before successful login. // Otherwise sending a simple header with bogus length of 16MB-1 will crash an embedded // client with memory exhaustion. if (!IsAuthorized()) { diff --git a/src/libs/ec/cpp/ECSocket.h b/src/libs/ec/cpp/ECSocket.h index 82b0c7be9e..a22d690e3b 100644 --- a/src/libs/ec/cpp/ECSocket.h +++ b/src/libs/ec/cpp/ECSocket.h @@ -112,7 +112,7 @@ class CECSocket{ * This is an asynchronous call, the function returns * immediately and the packet is sent on idle time. * - * @note It's the caller's responsibilty to \c delete + * @note It's the caller's responsibility to \c delete * the \e packet. */ void SendPacket(const CECPacket *packet); @@ -131,7 +131,7 @@ class CECSocket{ * The returned packet will be allocated on the heap with \c new, * or \c NULL is returned in case of an error (timeout). * - * @note It's the caller's responsibilty to \c delete both + * @note It's the caller's responsibility to \c delete both * request and reply. * * @note OnPacketReceived() won't be called for packets @@ -160,7 +160,7 @@ class CECSocket{ * Get a message describing the error. * * @param error The code of the error for which a message should be returned. - * @return The text descibing the error. + * @return The text describing the error. */ virtual std::string GetLastErrorMsg(); @@ -250,7 +250,7 @@ class CECSocket{ virtual bool InternalIsConnected() = 0; virtual void InternalDestroy() = 0; - // Was login succesfull ? + // Was login successful ? virtual bool IsAuthorized() { return true; } }; diff --git a/src/libs/ec/cpp/ECTag.cpp b/src/libs/ec/cpp/ECTag.cpp index 74118a43f8..4742307c58 100644 --- a/src/libs/ec/cpp/ECTag.cpp +++ b/src/libs/ec/cpp/ECTag.cpp @@ -1113,7 +1113,7 @@ void CECTag::DebugPrint(int level, bool print_empty) const * converted from UTF-8 to the internal application encoding. * Should be used with care (only on tags created with the * CECTag(ec_tagname_t, const wxString&) constructor), - * becuse it does not perform any check to see if the tag really contains a + * because it does not perform any check to see if the tag really contains a * string object. * * \return The string data of the tag. diff --git a/src/updownclient.h b/src/updownclient.h index 9a019da8e2..b43f11c258 100644 --- a/src/updownclient.h +++ b/src/updownclient.h @@ -109,7 +109,7 @@ class CUpDownClient : public CECID /** * Please note that only the ClientList is allowed to delete the clients. * To schedule a client for deletion, call the CClientList::AddToDeleteQueue - * funtion, which will safely remove dead clients once every second. + * function, which will safely remove dead clients once every second. */ ~CUpDownClient(); @@ -705,7 +705,7 @@ class CUpDownClient : public CECID uint32 m_score; uint16 m_waitingPosition; - //! This vector contains the avilability of parts for the file that the user + //! This vector contains the availability of parts for the file that the user //! is requesting. When changing it, be sure to call CKnownFile::UpdatePartsFrequency //! so that the files know the actual availability of parts. BitVector m_upPartStatus; @@ -779,7 +779,7 @@ class CUpDownClient : public CECID bool m_bHelloAnswerPending; - //! This vector contains the avilability of parts for the file we requested + //! This vector contains the availability of parts for the file we requested //! from this user. When changing it, be sure to call CPartFile::UpdatePartsFrequency //! so that the files know the actual availability of parts. BitVector m_downPartStatus; diff --git a/src/utils/aLinkCreator/src/alcc.cpp b/src/utils/aLinkCreator/src/alcc.cpp index 4d379ea5b6..6109bd8d47 100644 --- a/src/utils/aLinkCreator/src/alcc.cpp +++ b/src/utils/aLinkCreator/src/alcc.cpp @@ -81,7 +81,7 @@ int alcc::OnRun () { if (m_flagVerbose) { - wxLogMessage(_("%s ---> Non existant file !\n"),m_filesToHash[i].c_str()); + wxLogMessage(_("%s ---> Non existent file !\n"),m_filesToHash[i].c_str()); } } } diff --git a/src/utils/aLinkCreator/src/alcc.h b/src/utils/aLinkCreator/src/alcc.h index 94e61c4dfb..816e86ebe2 100644 --- a/src/utils/aLinkCreator/src/alcc.h +++ b/src/utils/aLinkCreator/src/alcc.h @@ -31,7 +31,7 @@ #include //----------------------------------------------------------------------------- -// This can be put in a separete include file +// This can be put in a separate include file #include static wxCSConv aMuleConv(wxT("iso8859-1")); #ifdef wxUSE_UNICODE diff --git a/src/utils/aLinkCreator/src/alcframe.cpp b/src/utils/aLinkCreator/src/alcframe.cpp index 457971958d..5ac6e94884 100644 --- a/src/utils/aLinkCreator/src/alcframe.cpp +++ b/src/utils/aLinkCreator/src/alcframe.cpp @@ -603,7 +603,7 @@ AlcFrame::OnAddUrlButton (wxCommandEvent & WXUNUSED(event)) } } - // Add only a not already existant URL + // Add only a not already existent URL if (UrlNotExists) { m_inputUrlListBox->Append(wxURI(url).BuildURI()); diff --git a/src/utils/aLinkCreator/src/ed2khash.cpp b/src/utils/aLinkCreator/src/ed2khash.cpp index d60200bce1..7d3c01a05c 100644 --- a/src/utils/aLinkCreator/src/ed2khash.cpp +++ b/src/utils/aLinkCreator/src/ed2khash.cpp @@ -125,7 +125,7 @@ bool Ed2kHash::SetED2KHashFromFile(const wxFileName& filename, MD4Hook hook) partcount++; #ifdef WANT_STRING_IMPLEMENTATION - // MD4_HASHLEN_BYTE is ABSOLUTLY needed as we dont want NULL + // MD4_HASHLEN_BYTE is ABSOLUTELY needed as we dont want NULL // character to be interpreted as the end of the parthash string #if wxUSE_UNICODE diff --git a/src/utils/amps/README b/src/utils/amps/README index 582accf292..f54feb84dd 100644 --- a/src/utils/amps/README +++ b/src/utils/amps/README @@ -28,7 +28,7 @@ distribution! Sometime in the near future I will complete the theme support I have stubbed into the script. If you have a colour scheme that you think looks good, modify -'style.css' and be sure to send me a copy of your new syle so I can include it +'style.css' and be sure to send me a copy of your new style so I can include it in future versions! Please send any bugs, translations, or verbal abuse to diff --git a/src/utils/cas/README b/src/utils/cas/README index caff01ade2..8cfa5a5894 100644 --- a/src/utils/cas/README +++ b/src/utils/cas/README @@ -2,7 +2,7 @@ C AMULE STATS -This is a little app that i've been doing cause i really didnt liked aStats. +This is a little app that i've been using because I really didn't like aStats. I was too slow, so i tried to do a little remake of it in c just to learn a bit more of c and do a nice app too. diff --git a/src/utils/cas/cas.c b/src/utils/cas/cas.c index 901886c96d..c934efa298 100644 --- a/src/utils/cas/cas.c +++ b/src/utils/cas/cas.c @@ -222,7 +222,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "Unable to open file %s\nCheck if you have amule online signature enabled.\n", path); exit(2); } - /* i believe this shouldnt be here. + /* i believe this shouldn't be here. The freq of update could be higher than 60 seconds. And it doesn't mean that the amule is not running. */ diff --git a/src/utils/cas/configfile.c b/src/utils/cas/configfile.c index 52a730faf7..c38f10642f 100644 --- a/src/utils/cas/configfile.c +++ b/src/utils/cas/configfile.c @@ -1,7 +1,7 @@ /* * Name: Config file functions * - * Purpose: Read info from casrc ou create one if it doesnt exist + * Purpose: Read info from casrc ou create one if it doesn't exist * * Author: Pedro de Oliveira * @@ -120,7 +120,7 @@ int readconfig(CONF *config) // Jacobo221 - [ToDo] Only first char per line is comment... if (fgets (buffer,120,conf)) { if (buffer[0] != '#') { - /* Only two fileds per line */ + /* Only two fields per line */ sscanf(buffer, "%" MAX_CONF_KEY_LEN_STR "s %*" MAX_CONF_ARG_LEN_STR "s", option); fflush (stdout); // Jacobo221 - [ToDo] So lines can't be swapped... diff --git a/src/utils/cas/configfile.h b/src/utils/cas/configfile.h index 341875b0c4..6bac0de63c 100644 --- a/src/utils/cas/configfile.h +++ b/src/utils/cas/configfile.h @@ -1,7 +1,7 @@ /* * Name: Config file functions * - * Purpose: Read info from casrc ou create one if it doesnt exist + * Purpose: Read info from casrc ou create one if it doesn't exist * * Author: Pedro de Oliveira * diff --git a/src/utils/cas/graphics.c b/src/utils/cas/graphics.c index f69c0e6479..2b649bf41d 100644 --- a/src/utils/cas/graphics.c +++ b/src/utils/cas/graphics.c @@ -37,7 +37,7 @@ #include "graphics.h" /* - * this is the funcion that writes the text to the image. + * this is the function that writes the text to the image. * almost everything is taken from libgd examples */ int createimage(CONF *config, char *lines[IMG_TEXTLINES], char *path_for_picture) diff --git a/src/utils/cas/tmp.html b/src/utils/cas/tmp.html index e71a20f7e6..712cab45ef 100644 --- a/src/utils/cas/tmp.html +++ b/src/utils/cas/tmp.html @@ -146,7 +146,7 @@ - Server Addres
+ Server Address
#IP#:#PORT#
diff --git a/src/utils/plasmamule/plasma-engine-plasmamule.cpp b/src/utils/plasmamule/plasma-engine-plasmamule.cpp index f571b38102..92e95cb385 100644 --- a/src/utils/plasmamule/plasma-engine-plasmamule.cpp +++ b/src/utils/plasmamule/plasma-engine-plasmamule.cpp @@ -105,7 +105,7 @@ void PlasmaMuleEngine::regDbus () new EngineAdaptor(this); QDBusConnection dbus = QDBusConnection::sessionBus(); dbus.registerObject("/Link", this); - kDebug(m_debugChannel) << "Registerred dbus: " << dbus.registerService("org.amule.engine"); + kDebug(m_debugChannel) << "Registered dbus: " << dbus.registerService("org.amule.engine"); } void PlasmaMuleEngine::downloadFinished (KIO::Job* job,const QByteArray& data) diff --git a/src/utils/scripts/denoiser.rules b/src/utils/scripts/denoiser.rules index 5f1a65adac..244c47a40b 100644 --- a/src/utils/scripts/denoiser.rules +++ b/src/utils/scripts/denoiser.rules @@ -107,7 +107,7 @@ s/-DHAVE_CONFIG_H// /^[^=]*CXXFLAGS/ b 8 b 9 :8 - # save -Wl, -Wa, and -Wp, flags, they're for linker, assember and preprocessor respectively + # save -Wl, -Wa, and -Wp, flags, they're for linker, assembler and preprocessor respectively s/ -Wl,/ -%l,/g s/ -Wa,/ -%a,/g s/ -Wp,/ -%p,/g @@ -255,7 +255,7 @@ s/-DHAVE_CONFIG_H// :5 # If --enable-maintainer-mode, Makefiles may be automatically regenerated. - # Denoise new Makefile aswell. + # Denoise new Makefile as well. /Makefile$/ { x /echo/! { diff --git a/src/utils/scripts/sanity b/src/utils/scripts/sanity index eca7d02c08..38cb40a213 100755 --- a/src/utils/scripts/sanity +++ b/src/utils/scripts/sanity @@ -1022,7 +1022,7 @@ end -#TODO Improved parameter-handling, add = for the outputing to a file +#TODO Improved parameter-handling, add = for the outputting to a file ARGV.each do |param| case param when "--text" then diff --git a/src/utils/scripts/wikify_latest_changelog b/src/utils/scripts/wikify_latest_changelog index 65d9ebd99e..a108122c45 100755 --- a/src/utils/scripts/wikify_latest_changelog +++ b/src/utils/scripts/wikify_latest_changelog @@ -18,7 +18,7 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -# Wikifies lastest changelog entry. No sanity checking. Must be run from sources root folder. +# Wikifies latest changelog entry. No sanity checking. Must be run from sources root folder. if test x"`ls docs/Changelog`" = x""; then echo "This script must be run on aMule base directory." else diff --git a/src/utils/wxCas/src/linuxmon.h b/src/utils/wxCas/src/linuxmon.h index 26e8007ef0..978b3a0b06 100644 --- a/src/utils/wxCas/src/linuxmon.h +++ b/src/utils/wxCas/src/linuxmon.h @@ -53,7 +53,7 @@ class LinuxMon /// Destructor ~LinuxMon (); - /// Refresh stored informations + /// Refresh stored information void Refresh (); /// Get system uptime diff --git a/src/utils/wxCas/src/onlinesig.h b/src/utils/wxCas/src/onlinesig.h index 2167c5e4d2..d0313053fa 100644 --- a/src/utils/wxCas/src/onlinesig.h +++ b/src/utils/wxCas/src/onlinesig.h @@ -83,7 +83,7 @@ class OnLineSig /// Set amulesig.dat file name and path void SetAmuleSig ( const wxFileName& file ); - /// Refresh stored informations + /// Refresh stored information void Refresh (); /// Return TRUE if aMule is running diff --git a/src/utils/wxCas/src/wxcasframe.cpp b/src/utils/wxCas/src/wxcasframe.cpp index 1c8b69393c..8d71643c7a 100644 --- a/src/utils/wxCas/src/wxcasframe.cpp +++ b/src/utils/wxCas/src/wxcasframe.cpp @@ -536,7 +536,7 @@ WxCasFrame::UpdateAll ( bool forceFitting ) bool needFit = UpdateStatsPanel (); if ( needFit || forceFitting ) { - // Fit stats pannel + // Fit stats panel m_mainPanel->Fit(); // Fit main frame diff --git a/src/utils/wxCas/src/wxcasprefs.cpp b/src/utils/wxCas/src/wxcasprefs.cpp index d87aad3461..101146c119 100644 --- a/src/utils/wxCas/src/wxcasprefs.cpp +++ b/src/utils/wxCas/src/wxcasprefs.cpp @@ -154,7 +154,7 @@ WxCasPrefs::WxCasPrefs ( wxWindow * parent ) : wxDialog ( parent, -1, m_ftpUpdateCheck = new wxCheckBox ( this, ID_FTP_UPDATE_CHECK, _ - ( "Upload periodicaly your stat image to FTP server" ) ); + ( "Upload periodically your stat image to FTP server" ) ); m_ftpUpdateSBoxSizer->Add ( m_ftpUpdateCheck, 0, wxGROW | wxALIGN_CENTER_VERTICAL | wxALL, 5 ); diff --git a/src/webserver/src/WebServer.cpp b/src/webserver/src/WebServer.cpp index 2dcb9df3d0..3a870ad7f9 100644 --- a/src/webserver/src/WebServer.cpp +++ b/src/webserver/src/WebServer.cpp @@ -635,7 +635,7 @@ bool ServersInfo::ReQuery() return false; } // - // query succeded - flush existing values and refill + // query succeeded - flush existing values and refill EraseAll(); for (CECPacket::const_iterator it = srv_reply->begin(); it != srv_reply->end(); ++it) { const CECTag *tag = & *it; @@ -855,7 +855,7 @@ bool UploadsInfo::ReQuery() return false; } // - // query succeded - flush existing values and refill + // query succeeded - flush existing values and refill EraseAll(); for (CECPacket::const_iterator it = up_reply->begin(); it != up_reply->end(); ++it) { diff --git a/src/webserver/src/php_amule_lib.cpp b/src/webserver/src/php_amule_lib.cpp index a84d44f361..6d45c9da94 100644 --- a/src/webserver/src/php_amule_lib.cpp +++ b/src/webserver/src/php_amule_lib.cpp @@ -39,8 +39,8 @@ #include /* - * Built-in php functions. Those are amule-specific funcions, accessing EC and internal - * datastructre + * Built-in php functions. Those are amule-specific functions, accessing EC and internal + * datastructure * */ diff --git a/src/webserver/src/php_syntree.cpp b/src/webserver/src/php_syntree.cpp index a52037ad81..d061461d69 100644 --- a/src/webserver/src/php_syntree.cpp +++ b/src/webserver/src/php_syntree.cpp @@ -326,7 +326,7 @@ PHP_SYN_NODE *make_switch_syn_node(PHP_EXP_NODE *cond, PHP_EXP_NODE *case_list) // // Bind all statement lists into single one for - // simplier execution + // simpler execution // PHP_SYN_NODE *stat_list_tail = 0; for(PHP_EXP_NODE *cur_case = case_list; cur_case; cur_case = cur_case->next) { @@ -2005,7 +2005,7 @@ void php_report_error(PHP_MSG_TYPE err_type, const char *msg, ...) // hope my error message will never be that big. // // security is ok, since _user_ errors are not reporting thru - // this function, but handled by scipt itself. + // this function, but handled by script itself. // However, badly written script MAY force user-supplied data to // leak here and create stack overrun exploit. Be warned. // diff --git a/src/webserver/src/php_syntree.h b/src/webserver/src/php_syntree.h index cc16efa6bb..79239888a0 100644 --- a/src/webserver/src/php_syntree.h +++ b/src/webserver/src/php_syntree.h @@ -394,7 +394,7 @@ extern "C" { PHP_VAR_NODE *make_array_var(void); - // signle operand expression: + // single operand expression: // FIXME: prefix and postfix form not recognized PHP_EXP_NODE *make_exp_1(PHP_EXP_OP op, PHP_EXP_NODE *operand); diff --git a/unittests/README b/unittests/README index 07fffdf975..9b30dfd08e 100644 --- a/unittests/README +++ b/unittests/README @@ -11,7 +11,7 @@ How to use: This section describes the step-by-step of creating a new testcase. It is recommended that each test-case (a collection of tests) is - placed in a seperate .cpp file, in general, one test-case per class. + placed in a separate .cpp file, in general, one test-case per class. In the following examples, I will test a non-existing stack template class which has the member-functions push (back) and pop (front). @@ -21,7 +21,7 @@ How to use: Test-cases exist in two flavors: With a fixture and without. A fixture is a way to ease the preparation before and after each test and consists of (optionally) a setUp function which - is run before each unittest, a tearDown function wich is run + is run before each unittest, a tearDown function which is run after each unittest and any number of member-variables and helper-functions. @@ -80,7 +80,7 @@ How to use: } - A test-case can have any number of unittests assosiated with it, + A test-case can have any number of unittests associated with it, but each test in a test-case must be uniquely named. diff --git a/unittests/muleunit/test.h b/unittests/muleunit/test.h index 0d499f8302..e604d66ff8 100644 --- a/unittests/muleunit/test.h +++ b/unittests/muleunit/test.h @@ -107,7 +107,7 @@ class CContext /** Adds a context with the specified information and description. */ CContext(const wxChar* file, int line, const wxString& desc); - /** Removes the context addded by the constructor. */ + /** Removes the context added by the constructor. */ ~CContext(); }; @@ -170,7 +170,7 @@ class Test Test(const wxString& testCaseName, const wxString& testName); /** - * Main Test desctructor + * Main Test destructor * Delete the testPartResult linked list. This is why the user should * only use the macro provided by muleunit to report a test result. */ @@ -241,7 +241,7 @@ class Test /** * Asserts that a condition is true. * If the condition is not true, a failure is generated. - * @param condition Condition to fullfill for the assertion to pass + * @param condition Condition to fulfill for the assertion to pass * @param message Message that will be displayed if this assertion fails */ #define ASSERT_TRUE_M(condition, message) \ @@ -361,7 +361,7 @@ class Test #define TEST(testCaseName, testName) TEST_M(testCaseName, testName, wxT(#testName)) /** - * Location to declare variables and objets. + * Location to declare variables and objects. * This is where user should declare members accessible by TESTF, * SETUP and TEARDOWN. * diff --git a/unittests/tests/FileDataIOTest.cpp b/unittests/tests/FileDataIOTest.cpp index 58ef7797a9..1ab5cfc378 100644 --- a/unittests/tests/FileDataIOTest.cpp +++ b/unittests/tests/FileDataIOTest.cpp @@ -51,7 +51,7 @@ void writePredefData(CFileDataIO* file) ///////////////////////////////////////////////////////////////////// -// Specialize this template for each implemention +// Specialize this template for each implementation // of the CFileDataIO interface you wish to test. // // This struct must be a subclass of Test. @@ -873,7 +873,7 @@ TEST(CFile, Create) file.WriteUInt32(1); } - // Check that owerwrite = false works as expected + // Check that overwrite = false works as expected { CFile file; ASSERT_FALSE(file.Create(testFile, false, testMode)); @@ -892,7 +892,7 @@ TEST(CFile, Create) ASSERT_TRUE(!file.IsOpened()); } - // Check that owerwrite = true works as expected + // Check that overwrite = true works as expected { CFile file; ASSERT_TRUE(file.Create(testFile, true, testMode)); diff --git a/unittests/tests/FormatTest.cpp b/unittests/tests/FormatTest.cpp index 0fbfac8712..d2be10a405 100644 --- a/unittests/tests/FormatTest.cpp +++ b/unittests/tests/FormatTest.cpp @@ -100,7 +100,7 @@ TEST(Format, SetStringAndGetString) -//! Test the two boundaries and a middle value of the specificed format +//! Test the two boundaries and a middle value of the specified format #define STANDARD_TYPE_TESTS(cformat, wxformat, type) \ STANDARD_TEST(cformat, wxformat, MIN(type)); \ STANDARD_TEST(cformat, wxformat, (type)(MAX(type) / 2)); \ diff --git a/unittests/tests/Makefile.am b/unittests/tests/Makefile.am index 499fd4ff75..bbfb17165a 100644 --- a/unittests/tests/Makefile.am +++ b/unittests/tests/Makefile.am @@ -1,5 +1,5 @@ # If any tests uses more than a cpp/h fileset, then -# make a seperate subfolder for it to reduce clutter. +# make a separate subfolder for it to reduce clutter. #SUBDIRS = EXTRA_DIST = diff --git a/unittests/tests/NetworkFunctionsTest.cpp b/unittests/tests/NetworkFunctionsTest.cpp index fcbc90ceed..08f46f4133 100644 --- a/unittests/tests/NetworkFunctionsTest.cpp +++ b/unittests/tests/NetworkFunctionsTest.cpp @@ -126,7 +126,7 @@ TEST(NetworkFunctions, StringIPtoUint32) ASSERT_FALSE(StringIPtoUint32(wxT("1.2.2147483648.4"), dummyIP)); ASSERT_FALSE(StringIPtoUint32(wxT("1.2.3.2147483648"), dummyIP)); - // Values greater than 2 ** 32 - 1 (triggered overflow and becames x - (2 ** 32 - 1)) + // Values greater than 2 ** 32 - 1 (triggered overflow and becomes x - (2 ** 32 - 1)) ASSERT_FALSE(StringIPtoUint32(wxT("4294967296.2.3.4"), dummyIP)); ASSERT_FALSE(StringIPtoUint32(wxT("1.4294967296.3.4"), dummyIP)); ASSERT_FALSE(StringIPtoUint32(wxT("1.2.4294967296.4"), dummyIP)); diff --git a/unittests/tests/RangeMapTest.cpp b/unittests/tests/RangeMapTest.cpp index 6756a7900a..8e441a833b 100644 --- a/unittests/tests/RangeMapTest.cpp +++ b/unittests/tests/RangeMapTest.cpp @@ -73,11 +73,11 @@ DECLARE(RangeMap); TestRangeMap m_map; TestRangeMap m_mmaps[3]; - // Identifers for the multirange maps + // Identifiers for the multirange maps enum Maps { CONT = 0, // Continues ranges, IE no gap - SSAME = 1, // Seperated but equal - SDIFF = 2 // Seperated and not equal + SSAME = 1, // Separated but equal + SDIFF = 2 // Separated and not equal }; // Sets up a few maps with predefined ranges. diff --git a/unittests/tests/StringFunctionsTest.cpp b/unittests/tests/StringFunctionsTest.cpp index c2d7b5a249..b9846aabbb 100644 --- a/unittests/tests/StringFunctionsTest.cpp +++ b/unittests/tests/StringFunctionsTest.cpp @@ -67,7 +67,7 @@ TEST(SimpleParser, Constructor) ASSERT_EQUALS(wxEmptyString, tkz1.next()); } - // String with no tokens should be return immediatly + // String with no tokens should be return immediately { CSimpleTokenizer tkz2(wxT(" abc "), wxT('-')); ASSERT_EQUALS(wxT(" abc "), tkz2.remaining());