From be9d2803caa5ca8893ec1cf79cc139ee8dd14a2e Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Fri, 25 Nov 2005 08:05:54 +0000 Subject: [PATCH] Bug 106386 Correct misspellings in source code patch by unknown@simplemachines.org r=timeless rs=brendan git-svn-id: svn://10.0.0.236/trunk@185268 18797224-902f-48f8-a5cc-f745e15eee43 --- .../RegisterAllocator/RegisterAllocator.cpp | 2 +- .../Debugger/Communication/DebuggerChannel.h | 2 +- mozilla/ef/Debugger/jvmdi.cpp | 2 +- mozilla/ef/Quality/BuildScript/buildef.pl | 2 +- mozilla/ef/Quality/PerlLib/BuildMod.pm | 4 +-- mozilla/ef/Runtime/ClassInfo/main.cpp | 2 +- mozilla/ef/Utilities/zlib/deflate.h | 2 +- mozilla/ef/Utilities/zlib/gzio.c | 4 +-- mozilla/ef/config/corerules.mk | 2 +- mozilla/ef/config/rules.mk | 2 +- mozilla/mstone/ChangeLog.2 | 2 +- mozilla/mstone/INSTALL | 2 +- mozilla/mstone/Makefile | 12 ++++---- mozilla/mstone/ToDo | 2 +- mozilla/mstone/allbuild | 6 ++-- mozilla/mstone/bin/args.pl | 2 +- mozilla/mstone/bin/mailmaster.pl | 8 +++--- mozilla/mstone/bin/makeindex.pl | 2 +- mozilla/mstone/bin/makeusers.pl | 2 +- mozilla/mstone/bin/protoconf.pl | 4 +-- mozilla/mstone/bin/reduce.pl | 28 +++++++++---------- mozilla/mstone/bin/report.pl | 20 ++++++------- mozilla/mstone/bin/series_utils.ksh | 2 +- mozilla/mstone/bin/setup.pl | 2 +- mozilla/mstone/conf/imap.series | 2 +- mozilla/mstone/conf/pop.series | 2 +- mozilla/mstone/conf/sample.wld | 4 +-- mozilla/mstone/conf/webmail.series | 2 +- mozilla/mstone/ospkg.sh | 2 +- mozilla/mstone/src/bench.h | 6 ++-- mozilla/mstone/src/client.c | 6 ++-- mozilla/mstone/src/errexit.c | 4 +-- mozilla/mstone/src/http.c | 2 +- mozilla/mstone/src/imap4.c | 20 ++++++------- mozilla/mstone/src/main.c | 2 +- mozilla/mstone/src/pop3.c | 2 +- mozilla/mstone/src/smtp.c | 4 +-- mozilla/mstone/src/sysdep.c | 4 +-- mozilla/mstone/src/wmap.c | 6 ++-- 39 files changed, 93 insertions(+), 93 deletions(-) diff --git a/mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.cpp b/mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.cpp index 471c376c8a6..6904fe48934 100644 --- a/mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.cpp +++ b/mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.cpp @@ -587,7 +587,7 @@ buildInterferenceGraph() bool RegisterAllocator:: canCoalesceRegisters(VirtualRegister& inVR, VirtualRegister& outVR, PRUint32& from, PRUint32& to) { - // We dont have to check the register class because if a Copy instruction + // We don't have to check the register class because if a Copy instruction // is emitted then in & out have the same register class. from = inVR.getRegisterIndex(); diff --git a/mozilla/ef/Debugger/Communication/DebuggerChannel.h b/mozilla/ef/Debugger/Communication/DebuggerChannel.h index 66cd16654de..5e277028e84 100644 --- a/mozilla/ef/Debugger/Communication/DebuggerChannel.h +++ b/mozilla/ef/Debugger/Communication/DebuggerChannel.h @@ -50,7 +50,7 @@ struct DebuggerMessageRequest struct DebuggerMessageResponse { - Int32 status; // 0 = succesful, non-zero is an error code + Int32 status; // 0 = successful, non-zero is an error code }; const Int32 kAddressToMethod = 120; diff --git a/mozilla/ef/Debugger/jvmdi.cpp b/mozilla/ef/Debugger/jvmdi.cpp index f1660fc33ef..0c0ccd8b344 100644 --- a/mozilla/ef/Debugger/jvmdi.cpp +++ b/mozilla/ef/Debugger/jvmdi.cpp @@ -53,7 +53,7 @@ JVMDI_GetThreadStatus(JNIEnv * /* env */, jthread thread, jint *statusPtr) /* Note: jvm.h has suspend/resume (which may be deprecated - as * Thread.suspend() has been). JVMDI version is different, as it * takes precautions to attempt to avoid deadlock. Also it - * cannot be depreciated. + * cannot be deprecated. */ /* * Suspend the specified thread. diff --git a/mozilla/ef/Quality/BuildScript/buildef.pl b/mozilla/ef/Quality/BuildScript/buildef.pl index 5f76bd329c1..7d32f237d29 100644 --- a/mozilla/ef/Quality/BuildScript/buildef.pl +++ b/mozilla/ef/Quality/BuildScript/buildef.pl @@ -35,7 +35,7 @@ while (1) { TestsMod::runSuite("testsuite.txt"); - # Run the conformance tests only if the build was sucessful. + # Run the conformance tests only if the build was successful. if ($runTests) { print "Tests not being run right now.\n"; diff --git a/mozilla/ef/Quality/PerlLib/BuildMod.pm b/mozilla/ef/Quality/PerlLib/BuildMod.pm index bc6ef220056..b8b914d6a35 100644 --- a/mozilla/ef/Quality/PerlLib/BuildMod.pm +++ b/mozilla/ef/Quality/PerlLib/BuildMod.pm @@ -109,7 +109,7 @@ sub build { } - # Check if the build is busted or sucessful. + # Check if the build is busted or successful. $buildStatusStr = ($buildStatus ? 'busted' : 'success'); print("Build Status: $buildStatusStr\n"); @@ -119,7 +119,7 @@ sub build { # Rename the log file. rename("${buildLog}", "${buildPlatform}${buildTarget}.last"); - # Return 1 if build was sucessful, else return 0; + # Return 1 if build was successful, else return 0; if ($buildStatusStr == 'success') { return 1; } else { diff --git a/mozilla/ef/Runtime/ClassInfo/main.cpp b/mozilla/ef/Runtime/ClassInfo/main.cpp index 6265bceeada..e7430c63173 100644 --- a/mozilla/ef/Runtime/ClassInfo/main.cpp +++ b/mozilla/ef/Runtime/ClassInfo/main.cpp @@ -187,7 +187,7 @@ int main(int argc, char **argv) dynamicallyResolved = info->lookupVirtualMethod(i, sig, vIndex, a); } catch (VerifyError err) { - printf("\tlookupVirtualMethod() failed with erorr %d\n", + printf("\tlookupVirtualMethod() failed with error %d\n", err.cause); printf("\tOk, so method is not virtual. trying static...\n"); diff --git a/mozilla/ef/Utilities/zlib/deflate.h b/mozilla/ef/Utilities/zlib/deflate.h index eed21cd7316..96a59bbfb6e 100644 --- a/mozilla/ef/Utilities/zlib/deflate.h +++ b/mozilla/ef/Utilities/zlib/deflate.h @@ -172,7 +172,7 @@ typedef struct internal_state { int nice_match; /* Stop searching when current match exceeds this */ /* used by trees.c: */ - /* Didn't use ct_data typedef below to supress compiler warning */ + /* Didn't use ct_data typedef below to suppress compiler warning */ struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ diff --git a/mozilla/ef/Utilities/zlib/gzio.c b/mozilla/ef/Utilities/zlib/gzio.c index 45c158061bc..eba981acae6 100644 --- a/mozilla/ef/Utilities/zlib/gzio.c +++ b/mozilla/ef/Utilities/zlib/gzio.c @@ -169,7 +169,7 @@ gzFile gzdopen (fd, mode) /* =========================================================================== Read a byte from a gz_stream; update next_in and avail_in. Return EOF for end of file. - IN assertion: the stream s has been sucessfully opened for reading. + IN assertion: the stream s has been successfully opened for reading. */ local int get_byte(s) gz_stream *s; @@ -194,7 +194,7 @@ local int get_byte(s) mode to transparent if the gzip magic header is not present; set s->err to Z_DATA_ERROR if the magic header is present but the rest of the header is incorrect. - IN assertion: the stream s has already been created sucessfully; + IN assertion: the stream s has already been created successfully; s->stream.avail_in is zero for the first time, but may be non-zero for concatenated .gz files. */ diff --git a/mozilla/ef/config/corerules.mk b/mozilla/ef/config/corerules.mk index ee3698ca465..ac0cbbd8772 100644 --- a/mozilla/ef/config/corerules.mk +++ b/mozilla/ef/config/corerules.mk @@ -687,7 +687,7 @@ dependclean:: rm -f $(MKDEPENDENCIES) +$(LOOP_OVER_DIR) -# CUR_DIR is neccesary since it seems to crash gmake otherwise +# CUR_DIR is necessary since it seems to crash gmake otherwise CUR_DIR = $(shell pwd) ifndef NO_IMPLICIT_DEPENDENCIES diff --git a/mozilla/ef/config/rules.mk b/mozilla/ef/config/rules.mk index 1427a92febd..93ed42d7f8b 100644 --- a/mozilla/ef/config/rules.mk +++ b/mozilla/ef/config/rules.mk @@ -32,7 +32,7 @@ include $(DEPTH)/config/corerules.mk ifneq ($(MODULE_NAME),) -# OBJFILTERS is neccesary for the ifneq check below +# OBJFILTERS is necessary for the ifneq check below # since OBJS seems to have an undetermined number of blanks in it OBJFILTERS = $(filter %$(OBJ_SUFFIX),$(OBJS)) diff --git a/mozilla/mstone/ChangeLog.2 b/mozilla/mstone/ChangeLog.2 index a73e22cc0c1..7d0fa7d855e 100644 --- a/mozilla/mstone/ChangeLog.2 +++ b/mozilla/mstone/ChangeLog.2 @@ -11,7 +11,7 @@ MailStone 4.15: Changes to Mailstone since version 4.1 in results//all.wld. * The '*.pl', '*.tbd', and 'config*' files in ./conf/ are - depreciated. These should still work, but the new sections are + deprecated. These should still work, but the new sections are simpler and more flexible. * Any CONFIG parameter can now be specified on the command line diff --git a/mozilla/mstone/INSTALL b/mozilla/mstone/INSTALL index c1b3b8880d0..bce6c42242b 100644 --- a/mozilla/mstone/INSTALL +++ b/mozilla/mstone/INSTALL @@ -39,7 +39,7 @@ Do initial configuration: Run "mstone config". It will ask you about your system configuration. Fill in the appropriate values and create the optional user accounts and broadcast account. When it asks about client machines, enter them -seperated by commas, with no spaces (e.g. host1,host2,host3). If you +separated by commas, with no spaces (e.g. host1,host2,host3). If you need to re-configure, run "mstone config". The machine starting the test may also be a client. For accurate diff --git a/mozilla/mstone/Makefile b/mozilla/mstone/Makefile index 17dcf73c41c..2c1a1903969 100644 --- a/mozilla/mstone/Makefile +++ b/mozilla/mstone/Makefile @@ -68,7 +68,7 @@ perl $(OBJDIR)/perl/perl:: $(MAKE) -f perl.mk PERL_DIR=$(PERL_DIR) perl # Create packaging binary directories -# Note: dont make gd or gnuplot here. For multi-OS, they are links +# Note: don't make gd or gnuplot here. For multi-OS, they are links mkpkgdirs:: $(PKGDIR)/bin $(PKGDIR)/conf $(PKGDIR)/data $(PKGDIR)/doc $(PKGDIR)/bin: @@ -142,7 +142,7 @@ pkg-perl-files:: $(PKGDIR)/bin $(OBJDIR)/perl/perl -$(STRIP) $(PKGDIR)/perl/bin/a2p # for combined packaging, this should not be part of pkg-arch-files -# perl is handled seperately do to its size +# perl is handled separately do to its size ifneq (,$(PERL_DIR)) pkg:: pkg-perl-files endif @@ -166,9 +166,9 @@ build/$(ZIPFILE): ######################################################################## # Generate a combined build for every Unix OS that is already packaged -# NT has to be done seperately because it has different file names -# We have to nuke some old parts, because permissions wont allow overwrites -# Finally, dont ship perl development headers and libraries +# NT has to be done separately because it has different file names +# We have to nuke some old parts, because permissions won't allow overwrites +# Finally, don't ship perl development headers and libraries all_DBG all_OPT:: @$(ECHO) "===== [`date`] unified packaging for $@..." $(MAKE) NSARCH=$@ OBJDIR_TAG='' \ @@ -222,7 +222,7 @@ debug:: $(MAKE) BUILD_VARIANT=debug OBJDIR_TAG=_DBG targets @$(ECHO) "\n===== [`date`] making debug build done." -# We dont usually bother to tar up a debug build +# We don't usually bother to tar up a debug build dpackage:: debug @$(ECHO) "\n===== [`date`] making debug package..." $(MAKE) BUILD_VARIANT=debug OBJDIR_TAG=_DBG pkg diff --git a/mozilla/mstone/ToDo b/mozilla/mstone/ToDo index 64e85ee1183..8e26cc6943f 100644 --- a/mozilla/mstone/ToDo +++ b/mozilla/mstone/ToDo @@ -101,7 +101,7 @@ may be costly, and can create holes in the proper sequence. Improve printing The color graphs are great on screen, but tend to print poorly. Either we need a better way to generate a printable version -(maybe through a CGI button), or the seperate protocols need to be +(maybe through a CGI button), or the separate protocols need to be printed individually. Also, Communicator does a lousy job of keeping title with tables or graphs. Hopefully, Mozilla will do better. diff --git a/mozilla/mstone/allbuild b/mozilla/mstone/allbuild index 7a9040433d9..812dbeadab2 100644 --- a/mozilla/mstone/allbuild +++ b/mozilla/mstone/allbuild @@ -85,7 +85,7 @@ ARGS="$@" for ARG in "$@"; do # If this is a make assignment (FOO=whatever), add it to make command -# Arguments with quotes in them dont go all the way through. +# Arguments with quotes in them don't go all the way through. # Make args trick: 'FOO=nop -j 2' # The pre-post arg stuff uses hostnames as a switch, ugly calling syntax. if [[ -n "`echo z$ARG | egrep '^z[A-Z0-9_]+=[^ ]'`" ]] ; then @@ -124,10 +124,10 @@ fi # And build on each machine: "cd $BUILDDIR && $BUILDCMD" -# expand targets (but dont confuse hosts for targets (msg7)) +# expand targets (but don't confuse hosts for targets (msg7)) # These will build just mstone -# expand targets (but dont confuse hosts for targets (msg7)) +# expand targets (but don't confuse hosts for targets (msg7)) if [[ "$BUILDCMD" = "" && "$ARG" = mailstone* ]]; then case ${ARG#mstone} in "") diff --git a/mozilla/mstone/bin/args.pl b/mozilla/mstone/bin/args.pl index 164d75c668f..e08c3dfac7f 100644 --- a/mozilla/mstone/bin/args.pl +++ b/mozilla/mstone/bin/args.pl @@ -296,7 +296,7 @@ sub kformat { # simple function to formatted a time into Ns, Nms, or Nus # the goal is to make a table of timss uncluttered and easy to read -# I dont convert to minutes or hours because the non-1000x multipliers +# I don't convert to minutes or hours because the non-1000x multipliers # are hard to back solve in your head for comparisons sub tformat { my $n = shift; diff --git a/mozilla/mstone/bin/mailmaster.pl b/mozilla/mstone/bin/mailmaster.pl index 680874f4b46..dabfdfb3072 100755 --- a/mozilla/mstone/bin/mailmaster.pl +++ b/mozilla/mstone/bin/mailmaster.pl @@ -338,7 +338,7 @@ if ($params{NT}) { # single client on local host $slist =~ s/HOSTS=\s*//; # strip off initial bit my $myCmd = $section->{COMMAND}; $myCmd =~ s/%f/$params{FREQUENCY}/; # fill in frequency variable - if ($myCmd =~ m/%c/o) { # dont force down if count is used + if ($myCmd =~ m/%c/o) { # don't force down if count is used $count = $testsecs / $params{FREQUENCY}; $myCmd =~ s/%c/$count/; # fill in count variable } @@ -371,7 +371,7 @@ if ($params{NT}) { # single client on local host $myCmd =~ s/,/ /g; # turn commas into spaces BACK COMPATIBIILITY $myCmd =~ s/%f/$params{FREQUENCY}/; # fill in frequency variable - if ($myCmd =~ m/%c/o) { # dont force down if count is used + if ($myCmd =~ m/%c/o) { # don't force down if count is used $count = $testsecs / $params{FREQUENCY}; $myCmd =~ s/%c/$count/; # fill in count variable } else { @@ -458,7 +458,7 @@ if ($params{NT}) { # single client on local host if (@localPids) { # print "Trapping extraneous local signals\n"; - # This doesnt trap quite right. We dont die, but shell returns... + # This doesn't trap quite right. We don't die, but shell returns... $SIG{ALRM} = 'IGNORE'; # in case we get an ALRM from the mailclient } @@ -495,7 +495,7 @@ if ($params{NT}) { # single client on local host $slist =~ s/HOSTS=\s*//; # strip off initial bit my $myCmd = $section->{COMMAND}; $myCmd =~ s/%f/$params{FREQUENCY}/; # fill in frequency variable - if ($myCmd =~ m/%c/o) { # dont force down if count is used + if ($myCmd =~ m/%c/o) { # don't force down if count is used $count = $testsecs / $params{FREQUENCY}; $myCmd =~ s/%c/$count/; # fill in count variable } diff --git a/mozilla/mstone/bin/makeindex.pl b/mozilla/mstone/bin/makeindex.pl index 791ddba5cb5..21236e93017 100755 --- a/mozilla/mstone/bin/makeindex.pl +++ b/mozilla/mstone/bin/makeindex.pl @@ -94,7 +94,7 @@ END if ($file eq $params{TSTAMP}) { next; } # written above my $dir = $file; $dir =~ s:/results.html::; - # dont read in old workloads, it will override the current one + # don't read in old workloads, it will override the current one print INDEXNEW "
$dir\n"; print INDEXNEW "    \n"; print INDEXNEW "workload\n"; diff --git a/mozilla/mstone/bin/makeusers.pl b/mozilla/mstone/bin/makeusers.pl index c96a03c6e8d..9c7b9d80393 100755 --- a/mozilla/mstone/bin/makeusers.pl +++ b/mozilla/mstone/bin/makeusers.pl @@ -170,7 +170,7 @@ sub readWorkConfig { # read the workload in, parse our params #$userpassword =~ s/%ld//g; } - # what isnt set: basedn, storebase, maxstores, usemsg4schema + # what isn't set: basedn, storebase, maxstores, usemsg4schema } while (@ARGV) { diff --git a/mozilla/mstone/bin/protoconf.pl b/mozilla/mstone/bin/protoconf.pl index 63b0729bccc..d9646b9d27a 100644 --- a/mozilla/mstone/bin/protoconf.pl +++ b/mozilla/mstone/bin/protoconf.pl @@ -74,7 +74,7 @@ # Totals are done during plotting, if needed %finals = (); # create base finals hash -# These are sections that dont get passed to mailclient (case insensitive) +# These are sections that don't get passed to mailclient (case insensitive) @scriptWorkloadSections = ( "Config", # special, references %params @@ -87,7 +87,7 @@ "PostTest", # things to run after test ); -# These are sections that arent protocols. Anything else must be. +# These are sections that aren't protocols. Anything else must be. @nonProtocolSections = (@scriptWorkloadSections, ("Default")); diff --git a/mozilla/mstone/bin/reduce.pl b/mozilla/mstone/bin/reduce.pl index 6b66c2df31e..1885e603364 100644 --- a/mozilla/mstone/bin/reduce.pl +++ b/mozilla/mstone/bin/reduce.pl @@ -414,7 +414,7 @@ sub parseLine { foreach $k (keys %scalar) { #print "$k=$scalar{$k} "; $subcli->{$k} = $scalar{$k}; - # Dont bother with time graphs here + # Don't bother with time graphs here } #print ") "; } @@ -441,10 +441,10 @@ sub parseLine { $lastTime, $time, $timeD, $ltype, "PROTOCOLS:$1", $chunk); } else { - die "parseLine: Unkown separator $posttext\n"; + die "parseLine: Unknown separator $posttext\n"; } } else { # direct assignment - # Note: we dont graph any scalars at the line level + # Note: we don't graph any scalars at the line level #print "$vname='$chunk'\n"; $scalar{$vname} = $chunk; # store for later $subcli->{$k} = $chunk if ($subcli); @@ -537,7 +537,7 @@ sub allocTimerStorage { my $graphs = shift; # hash of graphs my $ltype = shift; # hash of line parsing info my $fstr = shift; # format string to match - my $sepstr = shift; # seperator storage to fill in + my $sepstr = shift; # separator storage to fill in #print "parseTimer: format='$fstr'\n\tline='$line'\n"; my $sepf; @@ -578,7 +578,7 @@ sub allocTimerStorage { } # Walk a format discription and create storage hierarchy -# Also creates the seperator and field names lists used everywhere else +# Also creates the separator and field names lists used everywhere else # Some way to precompile the regular expressions (perl 5.005)? # Usage: allocStorage (clientsHash, graphHash, lineHash, format, "LINE") sub allocStorage { @@ -586,7 +586,7 @@ sub allocStorage { my $graphs = shift; # hash of graphs my $ltype = shift; # hash of line parsing info my $fstr = shift; # format string to match - my $sepstr = shift; # seperator storage to fill in + my $sepstr = shift; # separator storage to fill in #print "\nallocStorage format='$fstr'\n"; my @tlist = (); # list of text tokens @@ -612,7 +612,7 @@ sub allocStorage { next; } - $remf = $sepf . $remf # put seperator back in to remainder + $remf = $sepf . $remf # put separator back in to remainder unless ($sepf =~ /[\]\}]/); # unless after a timer/proto name #print "vname='$vname'\n"; @@ -626,8 +626,8 @@ sub allocStorage { $posttext =~ s/([][{}*+?^.\/])/\\$1/g; # quote regex syntax #print "`$lasttext' "; # this shows some trailing cruft, oops #print "remf='$remf'\n"; -# push @tlist, qr/$posttext/; # save seperator text - push @tlist, $posttext; # save seperator text +# push @tlist, qr/$posttext/; # save separator text + push @tlist, $posttext; # save separator text if ($lasttext =~ m/[][]/) { # timer #print "[$vname] "; @@ -662,7 +662,7 @@ sub allocStorage { } # recurse into protocol definition # this would allow recursive protocols, - # but this isnt supported elsewhere + # but this isn't supported elsewhere allocStorage ($clients->{$vname}, $graphs->{$vname}, $ltype, $ltype->{PROTOCOLS}->{$nm}, "PROTOCOLS:$vname"); @@ -952,9 +952,9 @@ $realTestSecs = $testsecs if ($realTestSecs > $testsecs); foreach $p (@protocols) { my $gp = $graphs{$p}; foreach $n (@{$protocolFields{$p}}) { # all timers - my $t = $n; # dont modify original list + my $t = $n; # don't modify original list if ($t =~ /^\[(\w+)\]$/) { $t = $1; } # strip off brackets - next unless ($gp->{$t}); # proto doesnt have this timer + next unless ($gp->{$t}); # proto doesn't have this timer my $sp = $gp->{$t}->{"Time2"}; # sum of time squared graph pointer my $tp = $gp->{$t}->{"Time"}; # sum of time graph pointer my $np = $gp->{$t}->{"Try"}; # try graph pointer @@ -985,9 +985,9 @@ foreach $p (@protocols) { foreach $p (@protocols) { my $gp = $graphs{$p}; foreach $n (@{$protocolFields{$p}}) { # all timers - my $t = $n; # dont modify original list + my $t = $n; # don't modify original list if ($t =~ /^\[(\w+)\]$/) { $t = $1; } # strip off brackets - next unless ($gp->{$t}); # proto doesnt have this timer + next unless ($gp->{$t}); # proto doesn't have this timer my $tp = $gp->{$t}->{"Time"}; # time graph pointer my $np = $gp->{$t}->{"Try"}; # try graph pointer diff --git a/mozilla/mstone/bin/report.pl b/mozilla/mstone/bin/report.pl index 10cad9672a4..0d5986b7e89 100644 --- a/mozilla/mstone/bin/report.pl +++ b/mozilla/mstone/bin/report.pl @@ -58,7 +58,7 @@ sub walkSetupTotals { sub setupTotals { # Figure out combined timers for "Total" protocol # We might do a smarter merge here (look at context and try to match order) - # As long as the first protocol is a superset, it wont matter + # As long as the first protocol is a superset, it won't matter my @tnames; foreach $proto (@protocols) { foreach $n (@{$protocolFields{$proto}}) { @@ -82,7 +82,7 @@ sub setupTotals { # Create "Total" hashes $finals{Total} = ArrayInstance->new(); foreach $n (@{$protocolFields{"Total"}}) { # all timers - my $t = $n; # dont modify original list + my $t = $n; # don't modify original list if ($t =~ /^\[(\w+)\]$/) { # Timer case, strip off brackets $finals{Total}->{$1} = ArrayInstance->new(); #print "Creating Total timer field $1\n"; @@ -121,9 +121,9 @@ sub setupTotals { # Convert Time2 to standard deviation foreach $proto (@protocolsAll) { foreach $n (@{$protocolFields{$proto}}) { - my $t = $n; # dont modify original list + my $t = $n; # don't modify original list if ($t =~ /^\[(\w+)\]$/) { $t = $1; } # strip off brackets - next unless ($finals{$proto}->{$t}); # proto doesnt have timer + next unless ($finals{$proto}->{$t}); # proto doesn't have timer next unless ($finals{$proto}->{$t}->{Try}); next unless ($finals{$proto}->{$t}->{Time2} > 0); my $ss = $finals{$proto}->{$t}->{Time2}; @@ -141,9 +141,9 @@ sub setupTotals { # Divide total times by trys to get averate time foreach $proto (@protocolsAll) { foreach $n (@{$protocolFields{$proto}}) { - my $t = $n; # dont modify original list + my $t = $n; # don't modify original list if ($t =~ /^\[(\w+)\]$/) { $t = $1; } # strip off brackets - next unless ($finals{$proto}->{$t}); # proto doesnt have timer + next unless ($finals{$proto}->{$t}); # proto doesn't have timer ($finals{$proto}->{$t}->{Try}) || next; $finals{$proto}->{$t}->{Time} /= $finals{$proto}->{$t}->{Try} } @@ -181,7 +181,7 @@ sub genTextReport { ($fieldNames{$f}) ? $fieldNames{$f} : $f; } foreach $n (@{$protocolFields{$proto}}) { - my $t = $n; # dont modify original list + my $t = $n; # don't modify original list unless ($t =~ /^\[(\w+)\]$/) { # scalar case #next; # skip scalars for now # do scalar counters. Column should line up with "Try" @@ -218,7 +218,7 @@ sub genTextReport { ($fieldNames{$f}) ? $fieldNames{$f} : $f; } foreach $n (@{$protocolFields{$proto}}) { - my $t = $n; # dont modify original list + my $t = $n; # don't modify original list unless ($t =~ /^\[(\w+)\]$/) { # scalar case #next; # skip scalars for now # do scalar counter/sec. Column should line up with "Try" @@ -370,7 +370,7 @@ END print RESULTSHTML "\n"; foreach $n (@{$protocolFields{$proto}}) { - my $t = $n; # dont modify original list + my $t = $n; # don't modify original list unless ($t =~ /^\[(\w+)\]$/) { # scalar case next; # skip scalars for now # do scalar counters. Column should line up with "Try" @@ -415,7 +415,7 @@ END print RESULTSHTML "\n"; foreach $n (@{$protocolFields{$proto}}) { - my $t = $n; # dont modify original list + my $t = $n; # don't modify original list unless ($t =~ /^\[(\w+)\]$/) { # scalar case next; # skip scalars for now # do scalar counters. Column should line up with "Try" diff --git a/mozilla/mstone/bin/series_utils.ksh b/mozilla/mstone/bin/series_utils.ksh index 5e5d1b122d4..ebf6d3a1fc4 100644 --- a/mozilla/mstone/bin/series_utils.ksh +++ b/mozilla/mstone/bin/series_utils.ksh @@ -53,7 +53,7 @@ save_run () { [[ -d $save_dir ]] || \ mkdir $save_dir - [[ $only_show_it -gt 0 ]] && return 0 # dont do anything important + [[ $only_show_it -gt 0 ]] && return 0 # don't do anything important if [[ -n "$last_timestamp" && -d "results/$last_timestamp/" ]] ; then cp -pR results/$last_timestamp $save_dir/ diff --git a/mozilla/mstone/bin/setup.pl b/mozilla/mstone/bin/setup.pl index 1c4b4434cf8..3320943a032 100644 --- a/mozilla/mstone/bin/setup.pl +++ b/mozilla/mstone/bin/setup.pl @@ -305,7 +305,7 @@ foreach $section (@workload) { } # most time critical first if ($mode eq "timesync") { - next if ($cli =~ /^localhost$/i); # dont reset our own time + next if ($cli =~ /^localhost$/i); # don't reset our own time # run all these in parallel to minimize skew next if ($section->{ARCH} eq "NT4.0"); forkproc ($rsh, $cli, "date $systime"); diff --git a/mozilla/mstone/conf/imap.series b/mozilla/mstone/conf/imap.series index 32e194e3ac7..eb6ae4c2054 100644 --- a/mozilla/mstone/conf/imap.series +++ b/mozilla/mstone/conf/imap.series @@ -13,7 +13,7 @@ export test_host="mail02" export desc_conf="12 CPUs" # Extra arguments common to all tests. Any other args go here. -# Note that arguments with embedded spaces wont work here. +# Note that arguments with embedded spaces won't work here. # Instead use: go_series -- export extra_args="" diff --git a/mozilla/mstone/conf/pop.series b/mozilla/mstone/conf/pop.series index 4bdc465fac2..8af8ee32c71 100644 --- a/mozilla/mstone/conf/pop.series +++ b/mozilla/mstone/conf/pop.series @@ -13,7 +13,7 @@ export test_host="mail02" export desc_conf="12 CPUs" # Extra arguments common to all tests. Any other args go here. -# Note that arguments with embedded spaces wont work here. +# Note that arguments with embedded spaces won't work here. # Instead use: go_series -- export extra_args="" diff --git a/mozilla/mstone/conf/sample.wld b/mozilla/mstone/conf/sample.wld index 63dcc63a7fd..cc815995a49 100644 --- a/mozilla/mstone/conf/sample.wld +++ b/mozilla/mstone/conf/sample.wld @@ -44,7 +44,7 @@ telemetry 1 # log telemetry (for debugging) - # These usually dont need to be set. These are the defaults + # These usually don't need to be set. These are the defaults GnuPlot gnuplot/gnuplot RSH ssh # RSH /usr/bin/remsh # HP-UX uses this path @@ -86,7 +86,7 @@ # Here is how to configure a WinNT client from a Unix mail master # The NT rshd must interoperate with Unix rsh; allow redirection of # stdin, stdout, and stderr; and must support binary file copies. -# Denicomp's wrshdnt has been used sucessfully. www.denicomp.com +# Denicomp's wrshdnt has been used successfully. www.denicomp.com Arch WINNT4.0 command mailclient.exe diff --git a/mozilla/mstone/conf/webmail.series b/mozilla/mstone/conf/webmail.series index a6baffc6efd..49a843da171 100644 --- a/mozilla/mstone/conf/webmail.series +++ b/mozilla/mstone/conf/webmail.series @@ -13,7 +13,7 @@ export test_host="mail02" export desc_conf="12 CPUs" # Extra arguments common to all tests. Any other args go here. -# Note that arguments with embedded spaces wont work here. +# Note that arguments with embedded spaces won't work here. # Instead use: go_series -- export extra_args="" diff --git a/mozilla/mstone/ospkg.sh b/mozilla/mstone/ospkg.sh index b09d0b3b26e..b11424e7ffc 100755 --- a/mozilla/mstone/ospkg.sh +++ b/mozilla/mstone/ospkg.sh @@ -42,7 +42,7 @@ do [ -d $pkgdir/perl ] || mkdir -p $pkgdir/perl cp -pf $srcdir/perl/Artistic $pkgdir/perl/ - # we dont pull everything in, just the potentially useful parts + # we don't pull everything in, just the potentially useful parts for subdir in man/man1 \ lib/$perlver lib/$perlver/$perlarch \ lib/$perlver/Time lib/$perlver/Term lib/$perlver/Class \ diff --git a/mozilla/mstone/src/bench.h b/mozilla/mstone/src/bench.h index a2585e9d53d..ef2e10dc85e 100644 --- a/mozilla/mstone/src/bench.h +++ b/mozilla/mstone/src/bench.h @@ -128,7 +128,7 @@ /* levels for timeexpired */ #define EXIT_SOON 1 /* do a clean shutdown ASAP */ -#define EXIT_FAST 20 /* shutdown now, dont block */ +#define EXIT_FAST 20 /* shutdown now, don't block */ #define EXIT_FASTEST 50 /* close sockets unconnditionally */ /* Debug macros */ @@ -154,7 +154,7 @@ typedef struct string_list { char * value; } string_list_t; -/* Numeric range (Shared). Previous value must be stored seperately */ +/* Numeric range (Shared). Previous value must be stored separately */ typedef struct range { unsigned long first; /* first valid value */ unsigned long last; /* last valid value */ @@ -296,7 +296,7 @@ typedef struct thread_context { The routine getting the system error sets errMsg (strcpy, or sprintf). Calling routines append a "call trace" with additional info (strcat). - The "call trace" starts with '<' as a seperator. + The "call trace" starts with '<' as a separator. */ #define debugfile (ptcx->dfile) diff --git a/mozilla/mstone/src/client.c b/mozilla/mstone/src/client.c index 591a8fa96d5..be126fb9517 100644 --- a/mozilla/mstone/src/client.c +++ b/mozilla/mstone/src/client.c @@ -56,7 +56,7 @@ static int FinishedThreads = 0; /* counter semaphore for children */ /* This is a sleep that knows about test end. Should also do throttling. - We dont check for signals because the only signal expected is test end + We don't check for signals because the only signal expected is test end */ void MS_idle(ptcx_t ptcx, int idleSecs) @@ -292,7 +292,7 @@ clientLoop(ptcx_t ptcx) ptcx->connectCount += do_command(ptcx, comm_index); ++ptcx->blockCount; - if (gf_timeexpired >= EXIT_SOON) break; /* done, dont throttle */ + if (gf_timeexpired >= EXIT_SOON) break; /* done, don't throttle */ /* For the single processes/thread case, this should be exact */ if ((gn_maxBlockCnt) /* check for max loops */ @@ -588,7 +588,7 @@ clientTimeSummary(ptcx_t ptcxs, int ntcxs, int clientnum, int outfd) for (pp=g_protocols; pp->name != NULL; ++pp) { /* output proto parts */ if (!pp->cmdCount) continue; /* not used */ (pp->statsOutput)(pp, &pp->stats, rqsttextbuf); - /* The \t seperates sections for report parsing */ + /* The \t separates sections for report parsing */ sprintf(&buf[strlen(buf)], "\t<%s blocks=%ld %s/>", pp->name, pp->stats.totalcommands, rqsttextbuf); diff --git a/mozilla/mstone/src/errexit.c b/mozilla/mstone/src/errexit.c index 5cf7d3b992d..00b96fb8f63 100644 --- a/mozilla/mstone/src/errexit.c +++ b/mozilla/mstone/src/errexit.c @@ -59,7 +59,7 @@ errexit(FILE *dfile, const char *format, ...) va_start(args, format); #if defined (HAVE_SNPRINTF) && defined (HAVE_VPRINTF) - /* puts as one chunk so that output doesnt get mixed up */ + /* puts as one chunk so that output doesn't get mixed up */ r = snprintf(buff, sizeof(buff), "%s[%d]\tt=%lu EXITING: ", gs_thishostname, gn_myPID, t); vsnprintf(buff+r, sizeof(buff) - r, format, args); @@ -103,7 +103,7 @@ returnerr(FILE *dfile, const char *format, ...) va_start(args, format); #if defined (HAVE_SNPRINTF) && defined (HAVE_VPRINTF) - /* puts as one chunk so that output doesnt get mixed up */ + /* puts as one chunk so that output doesn't get mixed up */ r = snprintf(buff, sizeof(buff), "%s[%d]\tt=%lu: ", gs_thishostname, gn_myPID, t); vsnprintf(buff+r, sizeof(buff) - r, format, args); diff --git a/mozilla/mstone/src/http.c b/mozilla/mstone/src/http.c index 954b1ef163e..022c3e75742 100644 --- a/mozilla/mstone/src/http.c +++ b/mozilla/mstone/src/http.c @@ -92,7 +92,7 @@ HttpParseStart (pmail_command_t cmd, mycmd->hostInfo.portNum = HTTP_PORT; /* get default port */ D_PRINTF(stderr, "Http Assign defaults\n"); - /* Fill in defaults first, ignore defaults we dont use */ + /* Fill in defaults first, ignore defaults we don't use */ for (pp = defparm; pp; pp = pp->next) { (void)HttpParseNameValue (cmd, pp->name, pp->value); } diff --git a/mozilla/mstone/src/imap4.c b/mozilla/mstone/src/imap4.c index 8875baf4932..5a0d5c779cc 100644 --- a/mozilla/mstone/src/imap4.c +++ b/mozilla/mstone/src/imap4.c @@ -129,7 +129,7 @@ Imap4ParseStart (pmail_command_t cmd, pish->hostInfo.portNum = IMAP4_PORT; /* get default port */ D_PRINTF(stderr, "Imap4 Assign defaults\n"); - /* Fill in defaults first, ignore defaults we dont use */ + /* Fill in defaults first, ignore defaults we don't use */ for (pp = defparm; pp; pp = pp->next) { (void)ImapParseNameValue (cmd, pp->name, pp->value); } @@ -377,7 +377,7 @@ readImapResponse(ptcx_t ptcx, SOCKET sock, int seqNum, char *buffer, int buflen) char markerSingleLine[20]; char markerMultiLine[20]; - /* marker to tell us when we've recieved the final line from server */ + /* marker to tell us when we've received the final line from server */ sprintf(markerSingleLine, "%d ", seqNum); sprintf(markerMultiLine, "\n%d ", seqNum); @@ -423,7 +423,7 @@ retrImapMsg(ptcx_t ptcx, SOCKET sock, int seqNum, char markerSingleLine[20]; char markerMultiLine[20]; - /* marker to tell us when we've recieved the final line from server */ + /* marker to tell us when we've received the final line from server */ sprintf(markerSingleLine, "%d ", seqNum); sprintf(markerMultiLine, "\n%d ", seqNum); @@ -784,7 +784,7 @@ imapRetrRecentMessages(ptcx_t ptcx, command, pIMAP->resp_buffer, sizeof(pIMAP->resp_buffer)); event_stop (ptcx, &stats->cmd); if (rc == -1) { - if (gf_timeexpired >= EXIT_FAST) break; /* dont fall into error */ + if (gf_timeexpired >= EXIT_FAST) break; /* don't fall into error */ return -1; } @@ -806,7 +806,7 @@ imapRetrRecentMessages(ptcx_t ptcx, if (numBytes == -1) { event_stop(ptcx, &stats->msgread); myfree(msgBuffer); - if (gf_timeexpired >= EXIT_FAST) break; /* dont fall into error */ + if (gf_timeexpired >= EXIT_FAST) break; /* don't fall into error */ stats->msgread.errs++; returnerr(debugfile, "IMAP4 Error sending [%s] command: %s\n", command, neterrstr()); @@ -819,7 +819,7 @@ imapRetrRecentMessages(ptcx_t ptcx, event_stop(ptcx, &stats->msgread); if (numBytes <= 0) { myfree(msgBuffer); - if (gf_timeexpired >= EXIT_FAST) break; /* dont fall into error */ + if (gf_timeexpired >= EXIT_FAST) break; /* don't fall into error */ stats->msgread.errs++; returnerr(debugfile, "IMAP4 Error retrieving msg %d: %s\n", i, neterrstr()); @@ -835,7 +835,7 @@ imapRetrRecentMessages(ptcx_t ptcx, command, pIMAP->resp_buffer, sizeof(pIMAP->resp_buffer)); event_stop (ptcx, &stats->cmd); if (rc == -1) { - if (gf_timeexpired >= EXIT_FAST) break; /* dont fall into error */ + if (gf_timeexpired >= EXIT_FAST) break; /* don't fall into error */ stats->cmd.errs++; return -1; } @@ -856,12 +856,12 @@ imapRetrRecentMessages(ptcx_t ptcx, command, pIMAP->resp_buffer, sizeof(pIMAP->resp_buffer)); event_stop (ptcx, &stats->cmd); if (rc == -1) { - if (gf_timeexpired >= EXIT_FAST) break; /* dont fall into error */ + if (gf_timeexpired >= EXIT_FAST) break; /* don't fall into error */ stats->cmd.errs++; return -1; } } else { - /* We dont mark it seen, but it still isnt new anymore... */ + /* We don't mark it seen, but it still isn't new anymore... */ D_PRINTF (stderr, "retrRecentMsgs() Leaving messaged %d unseen\n", i); } } @@ -874,7 +874,7 @@ imapRetrRecentMessages(ptcx_t ptcx, command, pIMAP->resp_buffer, sizeof(pIMAP->resp_buffer)); event_stop (ptcx, &stats->cmd); if (rc == -1) { - if (gf_timeexpired < EXIT_FAST) /* dont fall into error */ + if (gf_timeexpired < EXIT_FAST) /* don't fall into error */ return -1; stats->cmd.errs++; } diff --git a/mozilla/mstone/src/main.c b/mozilla/mstone/src/main.c index 16aa8540a88..b75cce40cce 100644 --- a/mozilla/mstone/src/main.c +++ b/mozilla/mstone/src/main.c @@ -762,7 +762,7 @@ waitChildren(void) for (;;) { errno = 0; - alarm(gt_stopinterval); /* dont wait forever */ + alarm(gt_stopinterval); /* don't wait forever */ pid = wait(&status); if (pid == -1) { if (errno == ECHILD) { diff --git a/mozilla/mstone/src/pop3.c b/mozilla/mstone/src/pop3.c index 0fd533e2345..9c232c44c1e 100644 --- a/mozilla/mstone/src/pop3.c +++ b/mozilla/mstone/src/pop3.c @@ -90,7 +90,7 @@ Pop3ParseStart (pmail_command_t cmd, pish->hostInfo.portNum = POP3_PORT; /* default port */ D_PRINTF(stderr, "Pop3 Assign defaults\n"); - /* Fill in defaults first, ignore defaults we dont use */ + /* Fill in defaults first, ignore defaults we don't use */ for (pp = defparm; pp; pp = pp->next) { (void)PopParseNameValue (cmd, pp->name, pp->value); } diff --git a/mozilla/mstone/src/smtp.c b/mozilla/mstone/src/smtp.c index d6b8285f483..52da3db6cbb 100644 --- a/mozilla/mstone/src/smtp.c +++ b/mozilla/mstone/src/smtp.c @@ -368,7 +368,7 @@ SmtpParseStart (pmail_command_t cmd, pish->hostInfo.portNum = SMTP_PORT; /* get default port */ D_PRINTF(stderr, "Smtp Assign defaults\n"); - /* Fill in defaults first, ignore defaults we dont use */ + /* Fill in defaults first, ignore defaults we don't use */ for (pp = defparm; pp; pp = pp->next) { (void)pishParseNameValue (cmd, pp->name, pp->value); } @@ -720,7 +720,7 @@ doSmtpCommandResponse(ptcx_t ptcx, SOCKET sock, char *command, char *response, i /* D_PRINTF(stderr, "SMTP command=[%s] response=[%s]\n", command, response); */ if (!isSmtpResponseOK(response)) { if (gf_timeexpired < EXIT_FAST) { - /* dont modify command (in case it could be re-tried) */ + /* don't modify command (in case it could be re-tried) */ trimEndWhite (response); /* clean up for printing */ strcpy (ptcx->errMsg, "SmtpCommandResponse: got SMTP error response"); } diff --git a/mozilla/mstone/src/sysdep.c b/mozilla/mstone/src/sysdep.c index 3448527adda..bee326d5c85 100644 --- a/mozilla/mstone/src/sysdep.c +++ b/mozilla/mstone/src/sysdep.c @@ -259,14 +259,14 @@ crank_limits(void) static void nullHandler(int sig) { - /* Dont do anything, (trap SIGPIPE) */ + /* Don't do anything, (trap SIGPIPE) */ return; } static void alarmHandler(int sig) { - /* Dont do anything, mainly break system calls */ + /* Don't do anything, mainly break system calls */ if (gf_timeexpired < EXIT_SOON) gf_timeexpired = EXIT_SOON; return; } diff --git a/mozilla/mstone/src/wmap.c b/mozilla/mstone/src/wmap.c index 0988dbfa480..e59aa8a6268 100644 --- a/mozilla/mstone/src/wmap.c +++ b/mozilla/mstone/src/wmap.c @@ -80,7 +80,7 @@ typedef struct wmap_command { int msgsize; /* message size without trailing CRLF.CRLF */ char * msgdata; /* cache the file in mem */ - /* flag to leave mail on server (dont delete read mail) */ + /* flag to leave mail on server (don't delete read mail) */ int leaveMailOnServer; /* WMAP client http header */ @@ -115,7 +115,7 @@ typedef struct wmap_command { /* State during command execution. */ -/* This is (now) parsed on the fly, doesnt have to be huge */ +/* This is (now) parsed on the fly, doesn't have to be huge */ #define RESPONSE_BUFFER_SIZE (3*1024) typedef struct _doWMAP_state { @@ -149,7 +149,7 @@ WmapParseStart(pmail_command_t cmd, char *line, param_list_t *defparm) wmap->hostInfo.portNum = WMAP_PORT; /* get default port */ D_PRINTF(stderr, "Wmap Assign defaults\n"); - /* Fill in defaults first, ignore defaults we dont use */ + /* Fill in defaults first, ignore defaults we don't use */ for (pp = defparm; pp; pp = pp->next) { (void)WmapParseNameValue(cmd, pp->name, pp->value); }