This commit was manufactured by cvs2svn to create tag 'release-1_4'.

git-svn-id: svn://10.0.0.236/tags/release-1_4@44388 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/directory/perldap/CREDITS

@@ -0,0 +1,48 @@
+This is a short list of people that have contributed to the success of
+this project.
+
+
+* Leif Hedstrom <leif@perldap.org>
+
+	- Project lead.
+	- Wrote some of the API code,  and most of OO layers (Conn.pm,
+	  Entry.pm etc.)
+	- Unix portability test.
+	- Port to Windows/NT and ActivePerl.
+
+
+* Clayton Donley
+
+	  - Wrote a lot of the initial API code (API.xs and API.pm).
+
+
+* Kevin McCarthy <kmccarth@perldap.org>
+
+	- Bug fixes, tons of contribution, particularly to the API.xs file.
+
+
+* Michelle Wyner <mwyner@perldap.org>
+
+	- Testing, bug fixes, and documentation, as well as working on new
+          modules for PerLDAP v2.0.
+
+
+* John Kristian <kristian@netscape.com>
+
+	- Rewrote the entire LDIF module, great stuff!
+
+
+* Netscape Netcenter team (Kevin Burns, Max Block, Mark Takacs etc.)
+
+	- Tons of ideas and requests for features.
+	- Discovering bugs daily (great, thanks... ;-).
+
+
+* Bob Ferguson <rferguso@netscape.com>
+
+	- Primary guinea pig for all my NT builds.
+
+
+* Everyone else that I've forgot to mention:
+
+	- Thanks for testing and debugging this package!

mozilla/directory/perldap/ChangeLog

@@ -0,0 +1,554 @@
+1999-08-24  Leif Hedstrom  <leif@netscape.com>
+
+	* Merged v1.3.x into trunk, tagged it as v1.4, and released it!
+
+1999-08-19  Leif Hedstrom  <leif@netscape.com>
+
+	* Changed internal version numbering again, just called this plain
+	v1.4.
+
+	* Entry.pm (FIRSTKEY): Bug fix, we'd crap out if there are no
+	attributes in the returned entry.
+	(NEXTKEY): Ditto.
+
+1999-08-18  Leif Hedstrom  <leif@netscape.com>
+
+	* Set version number to v1.4! Woohoo! Also tagged it as v1.3.4,
+	last "development" release.
+
+1999-08-17  Leif Hedstrom  <leif@netscape.com>
+
+	* Makefile.PL: Fixes for Windows/NT, cleaned out some code etc.
+	(MY::postamble): Support for "make html".
+
+	* MANIFEST: Updated with all new files etc.
+
+	* test.pl: Renamed to oldtest.pl, to avoid "make test" to fail.
+
+1999-08-16  Kevin McCarthy  <kmccarth@perldap.org> and Leif Hedstrom
+
+	* API.xs: Cleaned most all the memory allocation changes, we are
+	changing it to use the LDAP_OPT_MEMALLOC_FN_PTRS option in the
+	C-SDK instead (much cleaner!).
+	(perldap_init): New function, set up the memory management
+	handlers. This is called when the API module is loaded.
+	(perldap_malloc): New function, our memory management method(s).
+	(perldap_calloc): Ditto.
+	(perldap_realloc): Ditto.
+	(perldap_free): Ditto.
+
+1999-08-16  Kevin McCarthy  <kmccarth@perldap.org>
+
+	* API.xs: Cleaned up prototypes, changed strdup() to use a
+	Perl'ified version, change a number of free()'s to use Safefree.
+	(ldap_value_free_perl): New function, similar to
+	ldap_mods_free_perl(), to avoid memory problems (on NT and
+	ActivePerl primarily).
+	(StrDup): New function, to handle strdup() calls in a safe way.
+	(ber_bvfree_perl): Ditto.
+	(ber_bvecfree_perl): Ditto.
+
+1999-08-15  Leif Hedstrom  <leif@netscape.com>
+
+	* API.xs (ldap_mods_free_perl): Modified version of
+	ldap_mods_free(), which uses Perl native free method instead of
+	the things from the LDAP SDK. This fixes some nasty issues with
+	Windows/NT and ActiveState Perl. Woohoo!!!
+
+1999-08-14  Leif Hedstrom  <leif@netscape.com> and Kevin McCarthy
+
+	* Entry.pm (setValues): Implemented bug fix for bug id 7131, where
+	the "_save_" structures weren't set properly when using setValues().
+
+1999-08-14  Kevin McCarthy  <kmccarth@perldap.org>
+
+	* Conn.pm (update): Rewrote to optimize add/remove vs replace
+	operations. Basically, we'll try to do whatever seems to be the
+	smallest amount of work for the LDAP server now.
+
+1999-08-13  Leif Hedstrom  <leif@netscape.com>
+
+	* Makefile.PL: Cleaned up code, and added support for linking in
+	the missing libraries need for some missing symbols.
+
+1999-08-13  Michelle Wyner  <mwyner@netscape.com>
+
+	* Entry.pm: Updated documentation, and cleaned it up.
+
+	* Conn.pm: Ditto.
+
+1999-08-12  Leif Hedstrom  <leif@netscape.com>
+
+	* Entry.pm (move): Changed name, was rename(), is now move().
+
+1999-08-10  Leif Hedstrom  <leif@netscape.com>
+
+	* Entry.pm (setValues): Renamed, used to be setValue(), which is
+	now an alias to setValues().
+	(getValues): New method, to get the array of values.
+	(STORE): Fixed tests around DN handling, making sure it's not
+	treated as an array. I also optimized a couple of tests, since we
+	now filter out "DN" earlier in the funtion(s).
+	(attrModified): Ditto.
+	(attrClean): Ditto.
+	(unRemove): Ditto.
+	(removeValue): Ditto.
+	(addValue): Ditto.
+
+1999-08-08  Leif Hedstrom  <leif@netscape.com> and Kevin McCarthy
+
+	* Entry.pm (setValue): Remove _delete_ flag, if set.
+
+	* Conn.pm (close): Fixed memory leak, moved code from the DESTROY
+	method over here.
+	(DESTROY): Call the close() method.
+	(getErrorCode): We now return LDAP_SUCCESS if there is no LDAP
+	connection handle.
+	(getErrorString): Ditto.
+
+	* Entry.pm (STORE): Bug fix for large attribute sets.
+	(attrModified): Ditto.
+	(removeValue): Ditto.
+	(addValue): Ditto.
+	(EXISTS): Fix for bug 4368, cleaning up the code, and avoid the
+	double calls.
+
+1999-08-06  Leif Hedstrom  <leif@netscape.com> and Kevin McCarthy
+
+	* API.xs: Added some more tests around free() statements. These
+	are most likely never triggered, but better safe than sorrow (and
+	the overhead of testing this is insignificant).
+
+	* Conn.pm (browse): Added this function, to make it easy to browse
+	an entry.
+	(compare): Compare an attribute value against a DN/entry, without
+	having to do the search.
+
+	* Entry.pm (removeValue): Fixed loop bug.
+	(addValue): Ditto.
+	(hasValue): Ditto.
+	(matchValue): Fixed loop bug, and also missing normalization in
+	half of the case statement.
+	(rename): Added this new method, to rename attributes.
+	(copy): Added, to copy attributes.
+
+	* Merged v1.2.3 with v1.3 branch.
+
+1999-08-06  Kevin McCarthy  <kmccarth@perldap.org>
+
+	* Entry.pm (addDNValue): Bug fix, index for norm was wrong.
+
+	* Entry.pm (size): Optimzied for performance.
+
+1999-07-25  Kevin McCarthy  <kmccarth@perldap.org>
+
+        * API.xs: Fixed memory allocation problems in parsing and
+        generating the LDAPMods structure.
+
+1999-06-22  Leif Hedstrom  <leif@netscape.com>
+
+        * Conn.pm (add): Fixed bug 3342, thanks to Kevin McCarthy for
+        debugging this, and providing a patch. This fixes the problem with
+        adding new entries that has binary data.
+
+1999-03-23  Leif Hedstrom  <leif@netscape.com>
+
+	* Changed versioning numbers for all .pm files.
+
+1999-03-22  Leif Hedstrom  <leif@netscape.com>
+
+	* Entry.pm: Removed all _self_obj_ stuff...
+
+	* Conn.pm: Ditto.
+
+	* Conn.pm: Cleanup in use statements, and "use strict".
+	(search): Avoid warnings of uninitialized variables.
+	(searchURL): Ditto.
+	(modifyRDN): Bugfix, we did not update the appropriate DN in the
+	self object (very minor...).
+
+	* Entry.pm: Cleanup in use statements, and "use strict".
+	(BEGIN): Added this initializer, to use the new LDIF module.
+	(STORE): Fixed bug where we would not ignore the internal instance
+	variables properly.
+
+	* Utils.pm: Cleanup in all use statements, and "use strict". Also
+	enforces the VERSION control feature.
+
+	* Merged v1.2.1 to devel-branch-1_3, and tagged v1.3.1.
+
+1999-03-21  Leif Hedstrom  <leif@netscape.com>
+
+	* Checked in v1.2.1(beta).
+
+1999-03-19  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (add): Fixed the code so that it will handle hash array,
+	as the documentation indicates. (Pointed out by Kevin Burns).
+	(add): Code cleanup in the add() method.
+
+1999-03-18  Leif Hedstrom  <leif@netscape.com>
+
+	* Entry.pm: Changed back some of the "my" definitions, to make
+	sure arrays are properly reset.
+	(setValue): Added the _modified_ flag, from Stephen P. Schaefer
+	<stephen@networks.com>.
+	(addValue): Bug fix, when calling delete, and then
+	addValue(). From Stephen P. Schaefer as well.
+
+	* Conn.pm: Ditto. This fixes the bug where qsearch/printLDIF()
+	would print multiple values.
+
+1999-03-12  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm: Changed docs for modifyRDN(), it was wrong...
+
+1999-03-11  Leif Hedstrom  <leif@netscape.com>
+
+	* Entry.pm (new): Added this method, so that "new ...::Entry" will
+	work as expected.
+
+1999-03-09  Leif Hedstrom  <leif@netscape.com>
+
+	* Entry.pm: Tons of changes to handling the save/modified/deleted
+	attribute values.
+	(DESTROY): Added this destructor again, this time it does seem to
+	help quite a lot! Whoohoo...
+
+	* Conn.pm (update): Bug fix for bug #2530, keeping sort order for
+	attribute values.
+
+1999-03-08  Leif Hedstrom  <leif@netscape.com>
+
+	* Entry.pm (unRemove): Bug fix, this was terribly horked, please
+	let's try it to make sure it works...
+
+	* Conn.pm (newEntry): Bug fix, forgot to give it the self_obj
+	member value... Sigh.
+
+1999-03-05  Leif Hedstrom  <leif@netscape.com>
+
+	* Entry.pm (DELETE): We now handle the event that someone tries to
+	delete an internal attribute.
+
+	* Conn.pm (update): Bug: We forgot to test for existance of
+	"_save_" before trying to loop over it.
+
+	* Entry.pm (attrClean): Added this method, to make it easier to
+	reset the internal state of en Entry. This is used primarily by
+	the Conn.pm package.
+	(unRemove): Bug Fix: $selfl changed to $self...
+
+1999-02-28  Leif Hedstrom  <leif@netscape.com>
+
+	* Entry.pm (matchValue): Added support for the normalization,
+	which should have been done before... Bug #2854.
+
+	* Conn.pm (printError): Changed to use ldap_err2string instead of
+	ldap_perror.
+
+	* Utils.pm (ldapArgs): Changed "root" to "base" in the LD
+	structure.
+	(userCredentials): Ditto.
+
+	* Conn.pm: Changed documentation to reflect the "base/root"
+	change.
+
+1999-01-06  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (nextEntry): Fixed (tried to fix...) the bug with
+	missing attributes. I hope this will work, at a minimum I'm sure
+	it won't hurt. The idea is to keep the case on the attribute type
+	when requesting the values_len().
+
+1999-01-11  Leif Hedstrom  <leif@netscape.com>
+
+	* API.xs: Added IF statements around all ldap_value_free() calls.
+
+1999-01-05  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (getRes): Ooops, didn't return the appropriate
+	value... :(
+	(init): Changed test for LDAP_SUCCESS, to always return 0 or 1.
+	(close): Ditto.
+	(delete): Ditto.
+	(add): Ditto.
+	(modifyRDN): Ditto.
+	(update): Ditto.
+	(simpleAuth): Ditto.
+
+	* Entry.pm (NEXTKEY): Don't return the last $key if it's one that
+	should be hidden.
+
+	* Conn.pm (newEntry): New method, to create an empty LDAP::Entry
+	object. It is properly "tied" into the appropriate object.
+
+1999-01-04  Leif Hedstrom  <leif@netscape.com>
+
+	* Entry.pm (setDN): Added third optional argument, to enfoce DN
+	normalization.
+	(getDN): Ditto.
+	(hasDNValue): Ditto.
+	(matchDNValue): Ditto.
+
+	* Entry.pm (removeValue): Added support for DN normalization
+	(optional argument).
+	(addValue): Ditto
+	(getDN): Ditto.
+
+1998-12-31  Leif Hedstrom  <leif@netscape.com>
+
+	* Entry.pm (DESTROY): Added this method, don't know if it actually
+	makes any sense at all... :(
+
+	* Conn.pm (add): Use _oc_order_ to find a list of attributes, to
+	avoide calling the TIEHASH methods.
+	(update): Ditto.
+	(ALL): Clean out some "my" definitions.
+
+	* Entry.pm (unRemove): New function, to undo remove opertaions on
+	an attribute.
+	(DELETE): Bug-fix, don't undef the attribute, it would prevent us
+	from updating it properly in the Conn::update() method.
+	(remove): Ditto.
+
+	* Conn.pm (nextEntry): Return $obj instead of blessing the %entry
+	(again).
+
+1998-12-25  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (POD): Changed examples from $conn -> $entry.
+
+1998-12-17  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (DESTROY): undef the Perl data after doing a
+	ldap_msgfree(), bug #1964.
+	(search): Ditto.
+	(searchURL): Ditto.
+	(nextEntry): Changed the order of setting numattr, to make sure
+	it's zero if we don't find anything.
+
+1998-12-16  Leif Hedstrom  <leif@netscape.com>
+
+	* Entry.pm (FIRSTKEY): Modified to honor the oc_order.
+	(NEXTKEY): Ditto.
+	(markModified): Made as an alias for attrModified().
+
+	* Conn.pm (nextEntry): Added code to handle internal counters for
+	number of attributes in oc_order. This is used/needed for the
+	FIRSTKEY and NEXTKEY methods in the Entry/Tie::Hash object.
+
+	* Entry.pm (isAttr): New method, to make sure an attribute name
+	really is a valid LDAP attribute.
+	(FIRSTKEY): Now we'll handle each() and keys() properly, whooohoo!
+	(NEXTKEY): Ditto.
+
+1998-12-15  Leif Hedstrom  <leif@netscape.com>
+
+	* Entry.pm (isDeleted): Added new method, almost identical to isModified().
+	(EXISTS): New method, to implement the EXISTS functionality.
+
+	* API.xs (RET_CPP): Test for NULL pointers, bug #1387.
+	(RET_BVPP): Ditto.
+
+	* Utils.pm (ldapArgs): Fixed bug where "-s 0" would not be honored
+	(I'm an idiot, OK?).
+
+1998-12-14  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (getRes): New method, to return the internal result message.
+	(getLD): Use defined() around test for existence.
+
+1998-12-11  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (new): Make sure binddn and bindpasswd are set to the
+	empty string unless specified.
+	(init): Make sure certdb is defined before trying to use it.
+	(setDefaultRebindProc): Added default auth method, unless
+	explicitly specified.
+
+	* Utils.pm (askPassword): Added support for Term::ReadKey.
+	(askPassword): Moved the eval "use ..." here.
+	(userCredentials): Removed verbose print statement.
+	(askPassword): Added an optional argument to print a prompt;
+
+	* Conn.pm (setDefaultRebindProc): Added a default "auth" value, if
+	not provided in the call.
+
+1998-12-04  Leif Hedstrom  <leif@netscape.com>
+
+	* Makefile.PL: Modified so that "silent" install will actually
+	echo what options it's setting.
+	It will now croak() if the SDK dir specified doesn't exist.
+
+	* INSTALL: Updated to reflect new v1.1 stuff. Added links to the
+	FAQ.
+
+	* README: Ditto. Also changed some of the binary install
+	information, which might not be useful anyways...
+
+	* Makefile.PL: Added "filters" to remove .dll and .sl from shared
+	libraries when creating link options. I also replaced the code to
+	put the valid library extensions into a variable (bug #1344).
+
+	* Makefile.PL: Fixed some crap with the config parsing, and ENV
+	handling (for silent installs).
+
+1998-12-03  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (update): Bug fix, now we empty the hash array before
+	examining changed attributes (bug #1385).
+
+	* Makefile.PL: Added the "-nolinenumbers" XSUBS options (bug #1329).
+
+1998-09-26  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (init): Cleaned out _perror() calls.
+	(delete): Added support for calling delete() with an Entry::
+	object as paramter.
+	(new): Cleaned out some dead code for $ref.
+
+	* Entry.pm (setValue): New method, to avoid having to use Perl
+	assignment statements to set an entire attribute value.
+
+1998-09-18  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (init): Changed call to ldapssl_client_init() to pass a
+	0 value as the handle pointer. This avoids a Perl compiler warning.
+
+1998-09-12  Leif Hedstrom  <leif@netscape.com>
+
+	* LDIF.pm (readEntries): Changed tests for empty arguments, to use
+	defined().
+
+	* Utils.pm (ldapArgs): Bug fix, we used the wrong option for the
+	certificate (-P) when checking to set the LDAP port.
+	(normalizeDN): Chagned tests for empty arguments, to use use defined().
+
+	* Entry.pm (STORE): Changed tests for empty arguments, to use
+	defined().
+	(DELETE): Ditto.
+	(attrModified): Ditto.
+	(isModified): Ditto.
+	(remove): Ditto.
+	(removeValue): Ditto.
+	(addValue): Ditto.
+	(hasValue): Ditto.
+	(matchValue): Ditto.
+	(setDN): Ditto.
+	(size): Ditto.
+	(exists): Ditto.
+
+	* Conn.pm (printError): Changed test for $str to see if it's defined.
+	(delete): Cleaned up code around $dn.
+	(modifyRDN): Cleaned up testes around $dn and $del.
+
+1998-09-11  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (modifyRDN): We now preserve the case of the DN/RDN, but
+	still treat RDNs as CIS when comparing strings.
+
+1998-09-08  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (setDefaultRebindProc): Bug fix, it had the Ldapc:: crap
+	stil in there... :-(.
+	(simpleAuth): New method, to do simple authentication rebind.
+
+1998-09-07  Leif Hedstrom  <leif@netscape.com>
+
+	* Makefile.PL: Changed all <> to <STDIN>, to support command line
+	arguments for MakeMaker.
+
+1998-09-03  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (nextEntry): Fixed bug with case sensitivity.
+
+1998-08-18  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (setDefaultRebindProc): It's back!
+	Officially released PerLDAP v1.0.
+
+1998-08-13  Leif Hedstrom  <leif@netscape.com>
+
+	* Makefile.PL: Fixed so that automated installs works.
+
+	* Conn.pm (update): Fixed narly bug with ldap_modify()...
+
+	* All: Cleaned up some hash indexes, to make sure they are
+	properly quoted, and there are no conflicts to resolve.
+	
+	* Entry.pm (STORE): Fixed a bug with attribute names not being
+	properly added to _oc_order_.
+	(addValue): Ditto, added the same code as for STORE.
+
+1998-08-06  Leif Hedstrom  <leif@netscape.com>
+
+	* Entry.pm (printLDIF): Copied/modified from the Utils.pm library.
+	(isModified): Added this function, thought it might be useful.
+
+1998-08-03  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (modifyRDN): Fixed! It also has an option to take an
+	"external" DN as an argument, if supplied.
+
+1998-08-02  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (getErrorCode): Now takes two optional arguments, to
+	return the match string, and extra error string. Note that these
+	two arguments are pointers to strings!
+
+	* API.xs(ldap_get_lderrno): Fixed this function, at least it seems
+	to work now...
+
+	* Conn.pm (getLD): Added this function, convenient way to get the
+	LD from the OO layer.
+
+1998-07-30  Leif Hedstrom  <leif@netscape.com>
+
+	* Conn.pm (modifyRDN): New method, to rename the RDN of the entry.
+
+	* Utils.pm (answer): New function, from LdapUtils.pm.
+
+	* Conn.pm (delete): Fixed references to normalizeDN.
+
+	* Utils.pm (userCredentials): Added this function, to make it easy
+	to get credentials when binding as a user.
+	(normalizeDN): Fixed bugs, because of calling convention...
+
+	* Conn.pm (getError): Fixed bug with passing read-only argument.
+
+1998-07-29  Leif Hedstrom  <leif@netscape.com>
+
+	* Utils.pm (unixCrypt): Moved from my LdapUtils.pm module.
+	Added askPassword to the export tag.
+
+	* Conn.pm (new): Added support for passing a hash array of all the
+	parameters, as returned by the ldapArgs() function.
+
+	* Utils.pm (str2Scope): New function, for converting strings
+	(subtree) to a numerical scope value (2).
+	(askPassword): Ditto, ask for a password, interactively.
+	(ldapArgs): Ditto, handle common LDAP command line arguments.
+
+	* Makefile.PL: Minor change, to do regex match on OS version for
+	MSWin.
+
+	* Entry.pm: Changed all _XXX hash values to also end with a _,
+	hence making it easier to isolate them (/^_.*_$/).
+
+	* Conn.pm (nextEntry): Changed to accept that the attributes are
+	now arrays, not pointers to arrays. We still consider them as
+	pointers internally though, it's cleaner API.
+
+	* API.pm: Changed to use the native Exporter function to export
+	tags into EXPORT_OK.
+
+1998-07-22  Leif Hedstrom  <leif@netscape.com>
+
+	* LDIF.pm (readEntry): Moved from my LdapUtils.pm package.
+
+	* Utils.pm (printEntry): Moved from the ::Connection class, and
+	marked it as "obsolete".
+	(encodeBase64): Moved from my LdapUtils.pm package.
+	(decodeBase64): Ditto.
+

mozilla/directory/perldap/INSTALL

@@ -0,0 +1,98 @@
+PerLDAP installation instructions
+==================================
+
+Building this package is fairly straight forward, but requires some
+knowledge about using compilers and compiler tools on your system. If you
+are uncomfortable using these tools, we recommend you get one of the
+prebuilt binary distributions instead.
+
+
+Prerequisites
+=============
+
+In order to build the module, you'll need
+
+	- Perl, version 5.003 or later. We definitely recommend you to use
+          v5.004 or later.
+
+	- An ANSI-C compiler, e.g. gcc-2.x, or Visual C++ 5.0.
+
+	- The LDAP client libraries and include files, e.g. the SDK from
+	Netscape Communications. See the README file for information on
+	retrieving binaries.
+
+You can download (or CVS checkout) the Directory SDK source, see further
+information available on
+
+	http://www.mozilla.org/directory/
+
+and the FAQ at
+
+	http://www.mozilla.org/directory/faq/perldap-faq.html
+
+
+
+Building
+========
+
+This package uses the normal Perl5 MakeMaker installation system. To
+generate a Makefile appropriate for your platform, run perl on the
+provided Makefile.PL script, e.g.
+
+	% perl Makefile.PL
+
+
+You might have to use the command `perl5' or `perl-5.004', depending on
+how you installed Perl-5. The script will now ask you a few questions to
+find the necessary library and include files. A typical configuration
+session is
+
+    data 195% perl5 Makefile.PL
+
+    PerLDAP - Perl 5 Module for LDAP
+    ================================
+    Directory containing 'include' and 'lib' directory of the Netscape
+    LDAP Software Developer Kit (default: /usr): /opt/ldapsdk3
+    Using LDAPv3 Developer Kit (default: yes)?  
+    Include SSL Support (default: yes)?  
+    Libraries to link with (default: -L/opt/pkg/ldapsdk3/lib -lldapssl30):  
+    Checking if your kit is complete...
+    Looks good
+    Writing Makefile for Mozilla::LDAP::API
+
+
+
+The important question is where your LDAP SDK is installed, in the example
+above the base directory is /opt/ldapsdk3. This directory should have two
+subdirectories, named "lib" and "include". If you installed the SDK in the
+standard /usr hierarchy, use the default value as provided by the install
+script.
+
+Assuming you get no errors or warning, proceed with the build and install:
+
+	% make
+	% make install
+
+
+That should be it!
+
+
+Automated Configuration and Installs
+====================================
+
+The Makefile.PL script also honors a set of environment variables to make
+it possible to do configuration and installs non-interactively. The
+variables are
+
+        LDAPSDKDIR    - Full path to the C SDK base directory
+        LDAPV3ON      - Set to "N" to diable LDAP v3 (on by default)
+        LDAPSDKSSL    - Set to "N" to disable SSL (SSL is default)
+
+
+With these variables set, you will not be asked any of the questions above
+(but it will echo the paramaters). Just run the Makefile.PL script, and
+finish the build, e.g.
+
+        % perl5 Makefile.PL
+	% make
+	% make install

mozilla/directory/perldap/MANIFEST

@@ -0,0 +1,40 @@
+ChangeLog
+API.pm
+API.xs
+MANIFEST
+Makefile.PL
+constant.h
+oldtest.pl
+typemap
+Entry.pm
+Conn.pm
+LDIF.pm
+Utils.pm
+README
+INSTALL
+CREDITS
+RELEASE
+MPL-1.0.txt
+test_api/search.pl
+test_api/write.pl
+test_api/api.pl
+t/conn.pl
+t/entry.pl
+t/ChangeLog
+t/api.t
+t/conn.t
+t/entry.t
+t/ldif.t
+t/utils.t
+examples/ChangeLog
+examples/lfinger.pl
+examples/qsearch.pl
+examples/monitor.pl
+examples/ldappasswd.pl
+examples/rmentry.pl
+examples/tabdump.pl
+examples/modattr.pl
+examples/rename.pl
+examples/psoftsync.pl
+examples/changes2ldif.pl
+examples/rand_mods.pl

mozilla/directory/perldap/MPL-1.0.txt

@@ -0,0 +1,360 @@
+                           MOZILLA PUBLIC LICENSE
+                                Version 1.0
+
+                              ----------------
+
+1. Definitions.
+
+     1.1. ``Contributor'' means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. ``Contributor Version'' means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. ``Covered Code'' means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. ``Electronic Distribution Mechanism'' means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. ``Executable'' means Covered Code in any form other than Source
+     Code.
+
+     1.6. ``Initial Developer'' means the individual or entity identified as
+     the Initial Developer in the Source Code notice required by Exhibit A.
+
+     1.7. ``Larger Work'' means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. ``License'' means this document.
+
+     1.9. ``Modifications'' means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. ``Original Code'' means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this License
+     is not already Covered Code governed by this License.
+
+     1.11. ``Source Code'' means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus any
+     associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or a list of source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. ``You'' means an individual or a legal entity exercising rights
+     under, and complying with all of the terms of, this License or a future
+     version of this License issued under Section 6.1. For legal entities,
+     ``You'' includes any entity which controls, is controlled by, or is
+     under common control with You. For purposes of this definition,
+     ``control'' means (a) the power, direct or indirect, to cause the
+     direction or management of such entity, whether by contract or
+     otherwise, or (b) ownership of fifty percent (50%) or more of the
+     outstanding shares or beneficial ownership of such entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+
+          (a) to use, reproduce, modify, display, perform, sublicense and
+          distribute the Original Code (or portions thereof) with or without
+          Modifications, or as part of a Larger Work; and
+
+          (b) under patents now or hereafter owned or controlled by Initial
+          Developer, to make, have made, use and sell (``Utilize'') the
+          Original Code (or portions thereof), but solely to the extent that
+          any such patent is reasonably necessary to enable You to Utilize
+          the Original Code (or portions thereof) and not to any greater
+          extent that may be necessary to Utilize further Modifications or
+          combinations.
+
+     2.2. Contributor Grant.
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+
+          (a) to use, reproduce, modify, display, perform, sublicense and
+          distribute the Modifications created by such Contributor (or
+          portions thereof) either on an unmodified basis, with other
+          Modifications, as Covered Code or as part of a Larger Work; and
+
+          (b) under patents now or hereafter owned or controlled by
+          Contributor, to Utilize the Contributor Version (or portions
+          thereof), but solely to the extent that any such patent is
+          reasonably necessary to enable You to Utilize the Contributor
+          Version (or portions thereof), and not to any greater extent that
+          may be necessary to Utilize further Modifications or combinations.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be distributed
+     only under the terms of this License or a future version of this
+     License released under Section 6.1, and You must include a copy of this
+     License with every copy of the Source Code You distribute. You may not
+     offer or impose any terms on any Source Code version that alters or
+     restricts the applicable version of this License or the recipients'
+     rights hereunder. However, You may include an additional document
+     offering the additional rights described in Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which you contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that the
+     Modification is derived, directly or indirectly, from Original Code
+     provided by the Initial Developer and including the name of the Initial
+     Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+
+          (a) Third Party Claims.
+          If You have knowledge that a party claims an intellectual property
+          right in particular functionality or code (or its utilization
+          under this License), you must include a text file with the source
+          code distribution titled ``LEGAL'' which describes the claim and
+          the party making the claim in sufficient detail that a recipient
+          will know whom to contact. If you obtain such knowledge after You
+          make Your Modification available as described in Section 3.2, You
+          shall promptly modify the LEGAL file in all copies You make
+          available thereafter and shall take other steps (such as notifying
+          appropriate mailing lists or newsgroups) reasonably calculated to
+          inform those who received the Covered Code that new knowledge has
+          been obtained.
+
+          (b) Contributor APIs.
+          If Your Modification is an application programming interface and
+          You own or control patents which are reasonably necessary to
+          implement that API, you must also include this information in the
+          LEGAL file.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code, and this License in any documentation for the Source Code, where
+     You describe recipients' rights relating to Covered Code. If You
+     created one or more Modification(s), You may add your name as a
+     Contributor to the notice described in Exhibit A. If it is not possible
+     to put such notice in a particular Source Code file due to its
+     structure, then you must include such notice in a location (such as a
+     relevant directory file) where a user would be likely to look for such
+     a notice. You may choose to offer, and to charge a fee for, warranty,
+     support, indemnity or liability obligations to one or more recipients
+     of Covered Code. However, You may do so only on Your own behalf, and
+     not on behalf of the Initial Developer or any Contributor. You must
+     make it absolutely clear than any such warranty, support, indemnity or
+     liability obligation is offered by You alone, and You hereby agree to
+     indemnify the Initial Developer and every Contributor for any liability
+     incurred by the Initial Developer or such Contributor as a result of
+     warranty, support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of the
+     Covered Code is available under the terms of this License, including a
+     description of how and where You have fulfilled the obligations of
+     Section 3.2. The notice must be conspicuously included in any notice in
+     an Executable version, related documentation or collateral in which You
+     describe recipients' rights relating to the Covered Code. You may
+     distribute the Executable version of Covered Code under a license of
+     Your choice, which may contain terms different from this License,
+     provided that You are in compliance with the terms of this License and
+     that the license for the Executable version does not attempt to limit
+     or alter the recipient's rights in the Source Code version from the
+     rights set forth in this License. If You distribute the Executable
+     version under a different license You must make it absolutely clear
+     that any terms which differ from this License are offered by You alone,
+     not by the Initial Developer or any Contributor. You hereby agree to
+     indemnify the Initial Developer and every Contributor for any liability
+     incurred by the Initial Developer or such Contributor as a result of
+     any such terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to statute
+     or regulation then You must: (a) comply with the terms of this License
+     to the maximum extent possible; and (b) describe the limitations and
+     the code they affect. Such description must be included in the LEGAL
+     file described in Section 3.4 and must be included with all
+     distributions of the Source Code. Except to the extent prohibited by
+     statute or regulation, such description must be sufficiently detailed
+     for a recipient of ordinary skill to be able to understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A, and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation (``Netscape'') may publish revised
+     and/or new versions of the License from time to time. Each version will
+     be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If you create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), you must (a) rename Your license so that the
+     phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or
+     any confusingly similar phrase do not appear anywhere in your license
+     and (b) otherwise make it clear that your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial Developer,
+     Original Code or Contributor in the notice described in Exhibit A shall
+     not of themselves be deemed to be modifications of this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER
+     PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+     OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
+     GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND
+     ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE
+     BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT
+     EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a ``commercial item,'' as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer
+     software'' and ``commercial computer software documentation,'' as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if any,
+     provides otherwise), excluding its conflict-of-law provisions. With
+     respect to disputes in which at least one party is a citizen of, or an
+     entity chartered or registered to do business in, the United States of
+     America: (a) unless otherwise agreed in writing, all disputes relating
+     to this License (excepting any dispute relating to intellectual
+     property rights) shall be subject to final and binding arbitration,
+     with the losing party paying all costs of arbitration; (b) any
+     arbitration relating to this Agreement shall be held in Santa Clara
+     County, California, under the auspices of JAMS/EndDispute; and (c) any
+     litigation relating to this Agreement shall be subject to the
+     jurisdiction of the Federal Courts of the Northern District of
+     California, with venue lying in Santa Clara County, California, with
+     the losing party responsible for costs, including without limitation,
+     court costs and reasonable attorneys fees and expenses. The application
+     of the United Nations Convention on Contracts for the International
+     Sale of Goods is expressly excluded. Any law or regulation which
+     provides that the language of a contract shall be construed against the
+     drafter shall not apply to this License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     Except in cases where another Contributor has failed to comply with
+     Section 3.4, You are responsible for damages arising, directly or
+     indirectly, out of Your utilization of rights under this License, based
+     on the number of copies of Covered Code you made available, the
+     revenues you received from utilizing such rights, and other relevant
+     factors. You agree to work with affected parties to distribute
+     responsibility on an equitable basis.
+
+EXHIBIT A.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.0 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     http://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.''

mozilla/directory/perldap/Makefile.PL

@@ -0,0 +1,194 @@
+#############################################################################
+# $Id: Makefile.PL,v 1.15 1999-08-24 22:30:46 leif%netscape.com Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    The Makefile "source".
+#
+#############################################################################
+
+use ExtUtils::MakeMaker;
+use Config;
+use Carp;
+
+$perlpath = $Config{'perlpath'};
+$osname   = $Config{'osname'};
+
+$ldapsdk_loc = $ENV{"LDAPSDKDIR"}; # Full Path to C SDK Top-Level
+$ldapsdk_ssl = $ENV{"LDAPSDKSSL"}; # N to exclude SSL
+$ldapsdk_ver = $ENV{"LDAPV3ON"};   # N to exclude LDAP v3 features
+
+$libexts = "so|sl|a|lib";
+
+
+print "\nPerLDAP - Perl 5 Module for LDAP\n";
+print     "================================\n";
+
+$silent = 1;
+print "Directory containing 'include' and 'lib' directory of the Netscape\n";
+print "LDAP Software Developer Kit (default: /usr): ";
+if (!$ldapsdk_loc)
+{
+   $silent = 0;
+   chomp ($ldapsdk_loc = <STDIN>);
+   $ldapsdk_loc = "/usr" unless $ldapsdk_loc =~ /\S/;
+} else {
+  print "$ldapsdk_loc\n";
+}
+croak("Directory $ldapsdk_loc does not exist!") unless -d $ldapsdk_loc;
+
+if ($osname =~ /mswin/i)
+{
+   $dir_sep = "\\";
+} else {
+   $dir_sep = "/";
+}
+
+$include_ldap = $ldapsdk_loc . $dir_sep . "include";
+$lib_ldap = $ldapsdk_loc . $dir_sep . "lib";
+
+print "Using LDAPv3 Developer Kit (default: yes)?  ";
+if (!$ldapsdk_ver)
+{
+   $silent = 0;
+   chomp ($ldapsdk_ver = <STDIN>);
+} else {
+  print "YES\n";
+}
+$v3_def = "-DLDAPV3" unless ($ldapsdk_ver =~ /^n/i);
+
+   
+print "Include SSL Support (default: yes)?  ";
+if (!$ldapsdk_ssl)
+{
+   $silent = 0;
+   chomp ($ldapsdk_ssl = <STDIN>);
+} else {
+  print "YES\n";
+}
+$ssl_def = "-DUSE_SSL" unless ($ldapsdk_ssl =~ /^n/i);
+
+
+opendir(DIR,$lib_ldap);
+@files = grep{/ldap|lber/} readdir(DIR);
+closedir(DIR);
+
+if (!((@ldaplib = grep{/ldapssl.*\.($libexts)$/} @files) && $ssl_def))
+{
+   @ldaplib = grep{/ldap.*\.($libexts)$/} @files;
+   @lberlib = grep{/lber.*\.($libexts)$/} @files;
+}
+
+if ($#ldaplib < 0)
+{
+   die "No LDAP libraries found.";
+}
+
+if ($#ldaplib > 0)
+{
+   print "Located multiple libraries:\n";
+   foreach $alib (@ldaplib)
+   {
+      print " - $alib\n";
+   }
+}
+
+$lline_ldap = $ldaplib[0];
+$lline_ldap =~ s/^lib//;
+$lline_ldap =~ s/\.($libexts)$//;
+$lline = "-L$lib_ldap -l$lline_ldap";
+
+if ($#lberlib >= 0 && $lline =~ /ldap$/)
+{
+   $lline_lber = $lberlib[0];
+   $lline_lber =~ s/^lib//;
+   $lline_lber =~ s/\.($libexts)$//;
+   $lline .= " -l$lline_lber";
+}
+
+print "Libraries to link with (default: $lline):  ";
+if (!$silent)
+{
+   chomp ($lib_line = <STDIN>);
+   $lib_line = $lline unless $lib_line =~ /\S/;
+} else {
+  print "\n";
+}
+
+
+# Include directories etc.
+$my_includes = "";
+$my_includes .= " -I$include_ldap" unless ($include_ldap eq "/usr/include");
+
+
+# Add system dependant stuff here...
+@extras = ();
+if ($osname =~ /mswin/i)
+{
+   $my_extlib = "$lib_ldap\\$ldaplib[0]";
+   $my_extlib .= " $lib_ldap\\$lberlib[0]" if $lber_lib;
+   push(@extras, 'dynamic_lib' => {
+     'OTHERLDFLAGS' => "kernel32.lib oldnames.lib" });
+} else {
+   $my_extlib = "";
+}
+
+push(@extras,
+     CAPI => 'TRUE')
+    if ($] >= 5.005 and $^O eq 'MSWin32'
+        and $Config{archname} =~ /-object\b/i);
+
+push(@extras,
+     ABSTRACT => 'Perl methods for LDAP C API calls',
+     AUTHOR   => 'Netscape Communications Corp., Inc. and Clayton Donley')
+    if ($] >= 5.005);
+
+#
+# Ok, let's do it!
+#
+WriteMakefile(
+	      'NAME'		=> 	'Mozilla::LDAP::API',
+	      'DISTNAME'	=>	'PerLDAP',
+	      'VERSION_FROM'	=> 	'API.pm',
+	      'INC'		=>	$my_includes,
+	      'LIBS'		=> 	[$lib_line],
+	      'MYEXTLIB'	=>	$my_extlib,
+	      'DEFINE'		=> 	"$v3_def $ssl_def",
+	      'XSOPT'		=>	"-nolinenumbers",
+	      @extras
+);
+
+
+#
+# Generate a "make HTML" target
+#
+sub MY::postamble
+{
+  '
+.SUFFIXES: .pm .html
+.PHONY: html
+
+.pm.html:
+	pod2html --netscape $< > $@
+
+html:	Entry.html Conn.html Utils.html API.html LDIF.html $(FIRST_MAKEFILE)
+	@rm -f pod2html-itemcache pod2html-dircache
+'
+}

mozilla/directory/perldap/README

@@ -0,0 +1,131 @@
+#############################################################################
+#                                                                           #
+#            PerLDAP v1.4 - A Perl Developers' Kit for LDAP		    #
+#                                                                           #
+#############################################################################
+
+
+What is PerLDAP?
+================
+
+PerLDAP is a set of modules written in Perl and C that allow developers to
+leverage their existing Perl knowledge to easily access and manage LDAP-
+enabled directories.  PerLDAP makes it very easy to search, add, delete,
+and modify directory entries.  For example, Perl developers can easily
+build web applications to access information stored in a directory or
+create directory sync tools between directories and other services.
+
+PerLDAP is an open source development project, the result of a joint effort
+between Netscape and Clayton Donley, an open source developer.  PerLDAP
+currently provides the basic functions to allow Perl users to access and
+manipulate directories easily.  Based on developer feedback and
+involvement, PerLDAP will continue to evolve to include additional
+functionality in future releases.
+
+
+Compiling the PerLDAP Sources
+=============================
+
+The source to PerLDAP is available on the Mozilla site at:
+
+  http://www.mozilla.org/directory/
+
+You can either retrieve the .tar/zip file with the source distribution, or
+use CVS to checkout the module directly. The name of the CVS module is
+PerLDAP, and it checks out the directory
+
+  mozilla/directory/perldap
+
+Further instructions for using CVS and Mozilla is available at
+
+  http://www.mozilla.org/cvs.html
+
+and an FAQ for PerLDAP is at
+
+  http://www.mozilla.org/directory/faq/perldap-faq.html
+
+
+Instructions for building the source can be found in the INSTALL file
+in the source distribution. The latest stable release of PerLDAP is
+v1.4, the next version is planned to be v2.0 (development continues on the
+v1.9 development branch).
+
+
+Getting Started
+===============
+
+Documentation for this module is in standard Perl 'pod' format.  HTML
+versions of this documentation can also be found on the Netscape DevEdge
+site at:  http://developer.netscape.com/tech/directory/.
+
+Additionally, many good examples can be found in the 'examples' directory.
+
+
+Modules and Examples Included
+=============================
+
+Mozilla::LDAP::API - Low level interface between Perl and the LDAP C API
+Mozilla::LDAP::Entry - Perl methods for manipulating entry objects
+Mozilla::LDAP::Conn - Perl methods for performing LDAP operations
+Mozilla::LDAP::LDIF - Perl methods for utilizing LDIF
+Mozilla::LDAP::Utils - Some convenient LDAP related utilities
+test_api/search.pl - Tests low level API search calls
+test_api/write.pl  - Tests low level API write calls
+test_api/api.pl - Tests ALL low level LDAPv2 calls
+examples/lfinger.pl - LDAP version of the regular Unix finger command.
+examples/qsearch.pl - Simple ldapsearch replacement.
+examples/monitor.pl - Retrieve status information from an LDAP server.
+examples/ldappasswd.pl - Change the LDAP password for a user.
+examples/rmentry.pl - Remove an entire entry from the database.
+examples/rename.pl - Rename (modRDN) an entry.
+examples/tabdump.pl - Dump LDAP information into a tab separated file.
+examples/psoftsync.pl - Synchronize LDAP with a PeopleSoft "dump" file.
+
+
+All examples support the "standard" LDAP command line options, which are
+
+        -h hostname     LDAP server name
+        -p port #       LDAP port, default is 389 (or 636 for SSL)
+        -b base DN      LDAP Base-DN
+        -D bind DN      LDAP bind DN (connect to server as this "user")
+        -w bind pswd    Password to bind to the server
+        -P certfile     Use SSL, with the publick keys from this file
+
+
+Note that the examples currently only support Simple Authentication
+(passwords), the Client Authentication features (using certificates) will
+be used in the next release. All examples also honors the environment
+variable LDAP_BASEDN, set it to your systems base DN, e.g.
+
+        % setenv LDAP_BASEDN 'dc=netscape,dc=com'
+
+or for Bourne shell
+
+        # LDAP_BASEDN='dc=netscape,dc=com'; export LDAP_BASEDN
+
+
+Reporting problems and bugs
+===========================
+
+Address all bug reports and comments to the Mozilla newsgroups at:
+
+   news://news.mozilla.org/netscape.public.mozilla.directory
+
+
+License/Copyright
+=================
+
+Portions by Netscape (c) Copyright 1998 Netscape Communications Corp, Inc.
+Portions by Clayton Donley (c) Copyright 1998 Clayton Donley
+
+Please read the MPL-1.0.txt file included for information on the Mozilla
+Public License, which covers all files in this distribution.
+
+Known Bugs
+==========
+
+There are a number of issues still outstanding at the time of release.  Most
+of these are already in the process of being resolved.
+
+ - The Rebind operation on NT does NOT work properly when set to a Perl
+   function.  This is being investigated.

mozilla/directory/perldap/RELEASE

@@ -0,0 +1,79 @@
+#############################################################################
+#                                                                           #
+#                        PerLDAP Release Notes		                    #
+#                                                                           #
+#############################################################################
+
+VERSION 1.4 - AUGUST 18, 1999
+=============================
+
+This is primarily a bug fix release, however there are 5 new methods
+introduced as well.  Brief descriptions follow in this document.  To get
+full examples and a larger summary, see the PerLDAP Programmer's Guide.
+
+
+New Methods Added
+-----------------
+
+Entry.pm:
+	* getValues() - returns the array of values.
+	* move() - move one attribute to another, and delete the original.
+	* copy() - copy one attribute to another.
+	
+Conn.pm:
+	* browse() - makes it easy to browse an entry.
+	* compare() - compare an attribute value against a DN/entry
+		    without having to do the search.	
+
+
+Bug Fixes and other changes
+---------------------------
+
+Entry.pm:
+	* addDNValue() - fixed wrong index for norm.
+	* matchValue() - fixed missing normalization in half of case statement. 
+	* setValue() - remove _delete_ flag if set, fix for saving state.
+	* STORE - fixed not ignoring the internal instance variables properly.
+	* Fixed numerous bugs for large attribute sets.
+	* Fixed bug 4368 ("exists vs. EXISTS").
+	* Fixed several loop bugs.
+	* Removed all _self_obj_  references, it's obsolete in this
+	  version.
+	* We support each() and keys() now on the Entry object, to loop
+	  through all attribute names (types).
+
+
+Conn.pm:
+	* close() - fixed memory leak.
+	* modifyRDN() - fixed problem where we weren't updating the
+			appropriate DN in the self object.
+	* Fixed bug 3342 (problems adding entries with binary data).
+	* getErrorCode()/getErrorString() - return LDAP_SUCCESS if no
+					    LDAP connection handle.
+	* add() - fixed code to handle hash array as docs indicate.
+	* update() - optimization for "replace" vs "add/delete", we try to
+		     use whatever LDAPMod is most efficient.
+
+LDIF.pm:
+
+	* Complete rewrite, by John Kristian <kristian@netscape.com>.
+
+API.xs:
+	* Fixed memory allocation problems, replacing all memory management
+	  routines. This solves all known issues with ActiveState Perl.
+	* More safety checks around calls to *_free().
+
+	
+Miscellaneous
+-------------
+
+	* Various other optimizations on tests and such.
+	* Fixed most (all?) known memory leaks.
+	* Fixed a lot of problems with Makefile.PL, adding some new targets
+	  (like "make html"). Add a skeleton to "make test".
+	* Fixed numerous small bugs, as reported to Mozilla.
+	* We produce less warnings now, and try to "use strict" when
+	  appropriate.
+	* We have a new versioning scheme, conforming to standard
+	  Perl. We'll change this again when Perl's new versioning system
+	  is in place (allowing versions like 1.2.3).

mozilla/directory/perldap/Utils.pm

@@ -0,0 +1,387 @@
+#############################################################################
+# $Id: Utils.pm,v 1.13 1999-08-24 22:30:48 leif%netscape.com Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    Lots of Useful Little Utilities, for LDAP related operations.
+#
+#############################################################################
+
+package Mozilla::LDAP::Utils;
+
+use Mozilla::LDAP::API 1.4 qw(:constant);
+use Mozilla::LDAP::Conn;
+use Exporter;
+
+use strict;
+use vars qw($VERSION @ISA %EXPORT_TAGS);
+
+@ISA = qw(Exporter);
+$VERSION = "1.4";
+
+%EXPORT_TAGS = (
+		all => [qw(normalizeDN
+			   isUrl
+			   printEntry
+			   printentry
+			   encodeBase64
+			   decodeBase64
+			   str2Scope
+			   askPassword
+			   ldapArgs
+			   unixCrypt
+			   userCredentials
+			   answer)]
+		);
+
+
+# Add Everything in %EXPORT_TAGS to @EXPORT_OK
+Exporter::export_ok_tags('all');
+
+
+#############################################################################
+# Normalize the DN string (first argument), and return the new, normalized,
+# string (DN). This is useful to make sure that two syntactically
+# identical DNs compare (eq) as the same string.
+#
+sub normalizeDN
+{
+  my ($dn) = @_;
+  my (@vals);
+
+  return "" unless (defined($dn) && ($dn ne ""));
+
+  @vals = Mozilla::LDAP::API::ldap_explode_dn(lc $dn, 0);
+
+  return join(",", @vals);
+}
+
+
+#############################################################################
+# Checks if a string is a properly formed LDAP URL.
+#
+sub isURL
+{
+  return ldap_is_ldap_url($_[0]);
+}
+
+
+#############################################################################
+# Print an entry, in LDIF format. This is sort of obsolete, we encourage
+# you to use the :;LDAP::LDIF class instead.
+#
+sub printEntry
+{
+  my $entry = $_[0];
+  my ($attr);
+
+  local $_;
+
+  print "dn: ", $entry->{"dn"},"\n";
+  foreach $attr (@{$entry->{"_oc_order_"}})
+    {
+      next if ($attr =~ /^_.+_$/);
+      next if $entry->{"_${attr}_deleted_"};
+      foreach (@{$entry->{$attr}})
+	{
+	  print "$attr: $_\n";
+	}
+    }
+
+  print "\n";
+}
+*printentry = \*printEntry;
+
+
+#############################################################################
+# Perform Base64 encoding, this is based on MIME::Base64.pm, written
+# by Gisle Aas <gisle@aas.no>. If possible, use the MIME:: package instead.
+#
+sub encodeBase64
+{
+  my ($res) = "";
+  my ($eol) = "$_[1]";
+  my ($padding);
+
+  pos($_[0]) = 0;                          # ensure start at the beginning
+  while ($_[0] =~ /(.{1,45})/gs) {
+    $res .= substr(pack('u', $1), 1);
+    chop($res);
+  }
+
+  $res =~ tr|` -_|AA-Za-z0-9+/|;               # `# help emacs
+  $padding = (3 - length($_[0]) % 3) % 3;
+  $res =~ s/.{$padding}$/'=' x $padding/e if $padding;
+
+  if (length $eol) {
+    $res =~ s/(.{1,76})/$1$eol/g;
+  }
+
+  return $res;
+}
+ 
+ 
+#############################################################################
+# Perform Base64 decoding, this is based on MIME::Base64.pm, written
+# by Gisle Aas <gisle@aas.no>. If possible, use the MIME:: package instead.
+#
+sub decodeBase64
+{
+  my ($str) = shift;
+  my ($res) = "";
+  my ($len);
+ 
+  $str =~ tr|A-Za-z0-9+=/||cd;
+  Carp::croak("Base64 decoder requires string length to be a multiple of 4")
+    if length($str) % 4;
+
+  $str =~ s/=+$//;                        # remove padding
+  $str =~ tr|A-Za-z0-9+/| -_|;            # convert to uuencoded format
+  while ($str =~ /(.{1,60})/gs)
+    {
+      $len = chr(32 + length($1)*3/4);
+      $res .= unpack("u", $len . $1 );    # uudecode
+    }
+
+  return $res;
+}
+
+
+#############################################################################
+# Convert a "human" readable string to an LDAP scope value
+#
+sub str2Scope
+{
+  my ($str) = $_[0];
+
+  return $str if ($str =~ /^[0-9]+$/);
+
+  if ($str =~ /^sub/i)
+    {
+      return LDAP_SCOPE_SUBTREE;
+    }
+  elsif ($str =~ /^base/i)
+    {
+      return LDAP_SCOPE_BASE;
+    }
+  elsif ($str =~ /^one/i)
+    {
+      return LDAP_SCOPE_ONELEVEL;
+    }
+
+  # Default...
+  return LDAP_SCOPE_SUBTREE;
+}
+
+
+#############################################################################
+# Ask for a password, without displaying it on the TTY.
+#
+sub askPassword
+{
+  my ($prompt) = $_[0];
+  my ($hasReadKey) = 0;
+
+  eval "use Term::ReadKey";
+  $hasReadKey=1 unless ($@);
+
+  print "LDAP password: " if $prompt;
+  if ($hasReadKey)
+    {
+      ReadMode(2);
+      chop($_ = ReadLine(0));
+      ReadMode(0);
+    }
+  else
+    {
+      system('/bin/stty -echo');
+      chop($_ = <STDIN>);
+      system('/bin/stty echo');
+    }
+  print "\n";
+
+  return $_;
+}
+
+
+#############################################################################
+# Handle some standard LDAP options, and construct a nice little structure
+# that we can use later on. We really should have some appropriate defaults,
+# perhaps from an Mozilla::LDAP::Config module.
+#
+sub ldapArgs
+{
+  my ($bind, $base) = @_;
+  my (%ld);
+
+  $main::opt_v = $main::opt_n if defined($main::opt_n);
+  $main::opt_p = LDAPS_PORT if (!defined($main::opt_p) &&
+				defined($main::opt_P) &&
+				($main::opt_P ne ""));
+
+  $ld{"host"} = $main::opt_h || "ldap";
+  $ld{"port"} = $main::opt_p || LDAP_PORT;
+  $ld{"base"} = $main::opt_b || $base || $ENV{'LDAP_BASEDN'};
+  $ld{"root"} = $ld{"base"};
+  $ld{"bind"} = $main::opt_D || $bind || "";
+  $ld{"pswd"} = $main::opt_w || "";
+  $ld{"cert"} = $main::opt_P || "";
+  $ld{"scope"} = (defined($main::opt_s) ? $main::opt_s : LDAP_SCOPE_SUBTREE);
+
+  if (($ld{"bind"} ne "") && ($ld{"pswd"} eq ""))
+    {
+      $ld{pswd} = askPassword(1);
+    }
+
+  return %ld;
+}
+
+
+#############################################################################
+# Create a Unix-type password, using the "crypt" function. A random salt
+# is always generated, perhaps it should be an optional argument?
+#
+sub unixCrypt
+{
+   my ($ascii) =
+      "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+   my ($salt) = substr($ascii, rand(62), 1) . substr($ascii, rand(62), 1);
+
+   srand(time ^ $$);
+   crypt($_[0], $salt);
+}
+
+
+#############################################################################
+# Try to find a user to bind as, and possibly ask for the password. Pass
+# a pointer to the hash array with LDAP parameters to this function.
+#
+sub userCredentials
+{
+  my ($ld) = @_;
+  my ($conn, $entry, $pswd, $search);
+
+  if ($ld->{"bind"} eq "")
+    {
+      my ($base) = $ld->{"base"} || $ld->{"root"};
+
+      $conn = new Mozilla::LDAP::Conn($ld);
+      die "Could't connect to LDAP server " . $ld->{"host"} unless $conn;
+
+      $search = "(&(objectclass=inetOrgPerson)(uid=$ENV{USER}))";
+      $entry = $conn->search($base, "subtree", $search, 0, ("uid"));
+      return 0 if (!$entry || $conn->nextEntry());
+
+      $conn->close();
+      $ld->{"bind"} = $entry->getDN();
+    }
+
+  if ($ld->{"pswd"} eq "")
+    {
+      $ld->{"pswd"} = Mozilla::LDAP::Utils::askPassword(1);
+    }
+}
+
+
+#############################################################################
+# Ask a Y/N question, return "Y" or "N".
+#
+sub answer
+{
+  die "Default string must be Y or N."
+    unless (($_[0] eq "Y") || ($_[0] eq "N"));
+
+  chop($_ = <STDIN>);
+
+  return $_[0] if /^$/;
+  return "Y" if /^[yY]/;
+  return "N" if /^[nN]/;
+}
+
+
+#############################################################################
+# Mandatory TRUE return value.
+#
+1;
+
+
+#############################################################################
+# POD documentation...
+#
+__END__
+
+=head1 NAME
+
+  Mozilla::LDAP::Utils.pm - Collection of useful little utilities.
+
+=head1 SYNOPSIS
+
+  use Mozilla::LDAP::Utils;
+
+=head1 ABSTRACT
+
+
+=head1 DESCRIPTION
+
+
+=head1 OBJECT CLASS METHODS
+
+=over 13
+
+=item B<normalizeDN>
+
+This function will remove all extraneous white spaces in the DN, and also
+change all upper case characters to lower case. The only argument is the
+DN string to normalize, and the return value is the new, clean DN.
+
+=back
+
+=head1 EXAMPLES
+
+There are plenty of examples to look at, in the examples directory. We are
+adding more examples every day (almost).
+
+=head1 INSTALLATION
+
+Installing this package is part of the Makefile supplied in the
+package. See the installation procedures which are part of this package.
+
+=head1 AVAILABILITY
+
+This package can be retrieved from a number of places, including:
+
+    http://www.mozilla.org/directory/
+    Your local CPAN server
+
+=head1 CREDITS
+
+Most of this code was developed by Leif Hedstrom, Netscape Communications
+Corporation. 
+
+=head1 BUGS
+
+None. :)
+
+=head1 SEE ALSO
+
+L<Mozilla::LDAP::Conn>, L<Mozilla::LDAP::Entry>, L<Mozilla::LDAP::API>, and
+of course L<Perl>.
+
+=cut

mozilla/directory/perldap/constant.h

@@ -0,0 +1,954 @@
+/*
+ *******************************************************************************
+ * $Id: constant.h,v 1.7 1998-08-13 09:14:14 leif Exp $
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is PerLDAP. The Initial Developer of the Original
+ * Code is Netscape Communications Corp. and Clayton Donley. Portions
+ * created by Netscape are Copyright (C) Netscape Communications
+ * Corp., portions created by Clayton Donley are Copyright (C) Clayton
+ * Donley. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * DESCRIPTION
+ *    Constants.
+ *
+ *******************************************************************************/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+#ifdef __cplusplus
+}
+#endif
+
+#include <ldap.h>
+
+static int
+not_here(s)
+char *s;
+{
+    croak("%s not implemented on this architecture", s);
+    return -1;
+}
+
+double
+constant(name, arg)
+char *name;
+int arg;
+{
+    errno = 0;
+    if (name[0] == 'L' && name[1] == 'D' && name[2] == 'A' && name[3] == 'P'
+       && name[4] == '_')
+    {
+      switch (name[5]) {
+       case 'A':
+	if (strEQ(name, "LDAP_ADMINLIMIT_EXCEEDED"))
+#ifdef LDAP_ADMINLIMIT_EXCEEDED
+	    return LDAP_ADMINLIMIT_EXCEEDED;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_AFFECTS_MULTIPLE_DSAS"))
+#ifdef LDAP_AFFECTS_MULTIPLE_DSAS
+	    return LDAP_AFFECTS_MULTIPLE_DSAS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_ALIAS_DEREF_PROBLEM"))
+#ifdef LDAP_ALIAS_DEREF_PROBLEM
+	    return LDAP_ALIAS_DEREF_PROBLEM;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_ALIAS_PROBLEM"))
+#ifdef LDAP_ALIAS_PROBLEM
+	    return LDAP_ALIAS_PROBLEM;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_ALREADY_EXISTS"))
+#ifdef LDAP_ALREADY_EXISTS
+	    return LDAP_ALREADY_EXISTS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_AUTH_METHOD_NOT_SUPPORTED"))
+#ifdef LDAP_AUTH_METHOD_NOT_SUPPORTED
+	    return LDAP_AUTH_METHOD_NOT_SUPPORTED;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_AUTH_NONE"))
+#ifdef LDAP_AUTH_NONE
+	    return LDAP_AUTH_NONE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_AUTH_SASL"))
+#ifdef LDAP_AUTH_SASL
+	    return LDAP_AUTH_SASL;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_AUTH_SIMPLE"))
+#ifdef LDAP_AUTH_SIMPLE
+	    return LDAP_AUTH_SIMPLE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_AUTH_UNKNOWN"))
+#ifdef LDAP_AUTH_UNKNOWN
+	    return LDAP_AUTH_UNKNOWN;
+#else
+	    goto not_there;
+#endif
+        break;
+      case 'B':
+	if (strEQ(name, "LDAP_BUSY"))
+#ifdef LDAP_BUSY
+	    return LDAP_BUSY;
+#else
+	    goto not_there;
+#endif
+	break;
+      case 'C':
+	if (strEQ(name, "LDAP_CACHE_CHECK"))
+#ifdef LDAP_CACHE_CHECK
+	    return LDAP_CACHE_CHECK;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_CACHE_LOCALDB"))
+#ifdef LDAP_CACHE_LOCALDB
+	    return LDAP_CACHE_LOCALDB;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_CACHE_POPULATE"))
+#ifdef LDAP_CACHE_POPULATE
+	    return LDAP_CACHE_POPULATE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_CHANGETYPE_ADD"))
+#ifdef LDAP_CHANGETYPE_ADD
+	    return LDAP_CHANGETYPE_ADD;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_CHANGETYPE_ANY"))
+#ifdef LDAP_CHANGETYPE_ANY
+	    return LDAP_CHANGETYPE_ANY;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_CHANGETYPE_DELETE"))
+#ifdef LDAP_CHANGETYPE_DELETE
+	    return LDAP_CHANGETYPE_DELETE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_CHANGETYPE_MODDN"))
+#ifdef LDAP_CHANGETYPE_MODDN
+	    return LDAP_CHANGETYPE_MODDN;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_CHANGETYPE_MODIFY"))
+#ifdef LDAP_CHANGETYPE_MODIFY
+	    return LDAP_CHANGETYPE_MODIFY;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_CLIENT_LOOP"))
+#ifdef LDAP_CLIENT_LOOP
+	    return LDAP_CLIENT_LOOP;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_COMPARE_FALSE"))
+#ifdef LDAP_COMPARE_FALSE
+	    return LDAP_COMPARE_FALSE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_COMPARE_TRUE"))
+#ifdef LDAP_COMPARE_TRUE
+	    return LDAP_COMPARE_TRUE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_CONFIDENTIALITY_REQUIRED"))
+#ifdef LDAP_CONFIDENTIALITY_REQUIRED
+	    return LDAP_CONFIDENTIALITY_REQUIRED;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_CONNECT_ERROR"))
+#ifdef LDAP_CONNECT_ERROR
+	    return LDAP_CONNECT_ERROR;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_CONSTRAINT_VIOLATION"))
+#ifdef LDAP_CONSTRAINT_VIOLATION
+	    return LDAP_CONSTRAINT_VIOLATION;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_DECODING_ERROR"))
+#ifdef LDAP_DECODING_ERROR
+	    return LDAP_DECODING_ERROR;
+#else
+	    goto not_there;
+#endif
+	break;
+      case 'D':
+	if (strEQ(name, "LDAP_DEREF_ALWAYS"))
+#ifdef LDAP_DEREF_ALWAYS
+	    return LDAP_DEREF_ALWAYS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_DEREF_FINDING"))
+#ifdef LDAP_DEREF_FINDING
+	    return LDAP_DEREF_FINDING;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_DEREF_NEVER"))
+#ifdef LDAP_DEREF_NEVER
+	    return LDAP_DEREF_NEVER;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_DEREF_SEARCHING"))
+#ifdef LDAP_DEREF_SEARCHING
+	    return LDAP_DEREF_SEARCHING;
+#else
+	    goto not_there;
+#endif
+	break;
+      case 'E':
+	if (strEQ(name, "LDAP_ENCODING_ERROR"))
+#ifdef LDAP_ENCODING_ERROR
+	    return LDAP_ENCODING_ERROR;
+#else
+	    goto not_there;
+#endif
+	break;
+      case 'F':
+	if (strEQ(name, "LDAP_FILTER_ERROR"))
+#ifdef LDAP_FILTER_ERROR
+	    return LDAP_FILTER_ERROR;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_FILT_MAXSIZ"))
+#ifdef LDAP_FILT_MAXSIZ
+	    return LDAP_FILT_MAXSIZ;
+#else
+	    goto not_there;
+#endif
+	break;
+      case 'I':
+	if (strEQ(name, "LDAP_INAPPROPRIATE_AUTH"))
+#ifdef LDAP_INAPPROPRIATE_AUTH
+	    return LDAP_INAPPROPRIATE_AUTH;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_INAPPROPRIATE_MATCHING"))
+#ifdef LDAP_INAPPROPRIATE_MATCHING
+	    return LDAP_INAPPROPRIATE_MATCHING;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_INSUFFICIENT_ACCESS"))
+#ifdef LDAP_INSUFFICIENT_ACCESS
+	    return LDAP_INSUFFICIENT_ACCESS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_INVALID_CREDENTIALS"))
+#ifdef LDAP_INVALID_CREDENTIALS
+	    return LDAP_INVALID_CREDENTIALS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_INVALID_DN_SYNTAX"))
+#ifdef LDAP_INVALID_DN_SYNTAX
+	    return LDAP_INVALID_DN_SYNTAX;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_INVALID_SYNTAX"))
+#ifdef LDAP_INVALID_SYNTAX
+	    return LDAP_INVALID_SYNTAX;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_IS_LEAF"))
+#ifdef LDAP_IS_LEAF
+	    return LDAP_IS_LEAF;
+#else
+	    goto not_there;
+#endif
+	break;
+      case 'L':
+	if (strEQ(name, "LDAP_LOCAL_ERROR"))
+#ifdef LDAP_LOCAL_ERROR
+	    return LDAP_LOCAL_ERROR;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_LOOP_DETECT"))
+#ifdef LDAP_LOOP_DETECT
+	    return LDAP_LOOP_DETECT;
+#else
+	    goto not_there;
+#endif
+	break;
+      case 'M':
+	if (strEQ(name, "LDAP_MOD_ADD"))
+#ifdef LDAP_MOD_ADD
+	    return LDAP_MOD_ADD;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_MOD_BVALUES"))
+#ifdef LDAP_MOD_BVALUES
+	    return LDAP_MOD_BVALUES;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_MOD_DELETE"))
+#ifdef LDAP_MOD_DELETE
+	    return LDAP_MOD_DELETE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_MOD_REPLACE"))
+#ifdef LDAP_MOD_REPLACE
+	    return LDAP_MOD_REPLACE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_MORE_RESULTS_TO_RETURN"))
+#ifdef LDAP_MORE_RESULTS_TO_RETURN
+	    return LDAP_MORE_RESULTS_TO_RETURN;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_MSG_ALL"))
+#ifdef LDAP_MSG_ALL
+	    return LDAP_MSG_ALL;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_MSG_ONE"))
+#ifdef LDAP_MSG_ONE
+	    return LDAP_MSG_ONE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_MSG_RECEIVED"))
+#ifdef LDAP_MSG_RECEIVED
+	    return LDAP_MSG_RECEIVED;
+#else
+	    goto not_there;
+#endif
+	break;
+      case 'N':
+	if (strEQ(name, "LDAP_NAMING_VIOLATION"))
+#ifdef LDAP_NAMING_VIOLATION
+	    return LDAP_NAMING_VIOLATION;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_NOT_ALLOWED_ON_NONLEAF"))
+#ifdef LDAP_NOT_ALLOWED_ON_NONLEAF
+	    return LDAP_NOT_ALLOWED_ON_NONLEAF;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_NOT_ALLOWED_ON_RDN"))
+#ifdef LDAP_NOT_ALLOWED_ON_RDN
+	    return LDAP_NOT_ALLOWED_ON_RDN;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_NOT_SUPPORTED"))
+#ifdef LDAP_NOT_SUPPORTED
+	    return LDAP_NOT_SUPPORTED;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_NO_LIMIT"))
+#ifdef LDAP_NO_LIMIT
+	    return LDAP_NO_LIMIT;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_NO_MEMORY"))
+#ifdef LDAP_NO_MEMORY
+	    return LDAP_NO_MEMORY;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_NO_OBJECT_CLASS_MODS"))
+#ifdef LDAP_NO_OBJECT_CLASS_MODS
+	    return LDAP_NO_OBJECT_CLASS_MODS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_NO_RESULTS_RETURNED"))
+#ifdef LDAP_NO_RESULTS_RETURNED
+	    return LDAP_NO_RESULTS_RETURNED;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_NO_SUCH_ATTRIBUTE"))
+#ifdef LDAP_NO_SUCH_ATTRIBUTE
+	    return LDAP_NO_SUCH_ATTRIBUTE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_NO_SUCH_OBJECT"))
+#ifdef LDAP_NO_SUCH_OBJECT
+	    return LDAP_NO_SUCH_OBJECT;
+#else
+	    goto not_there;
+#endif
+	break;
+      case 'O':
+	if (strEQ(name, "LDAP_OBJECT_CLASS_VIOLATION"))
+#ifdef LDAP_OBJECT_CLASS_VIOLATION
+	    return LDAP_OBJECT_CLASS_VIOLATION;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPERATIONS_ERROR"))
+#ifdef LDAP_OPERATIONS_ERROR
+	    return LDAP_OPERATIONS_ERROR;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_CACHE_ENABLE"))
+#ifdef LDAP_OPT_CACHE_ENABLE
+	    return LDAP_OPT_CACHE_ENABLE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_CACHE_FN_PTRS"))
+#ifdef LDAP_OPT_CACHE_FN_PTRS
+	    return LDAP_OPT_CACHE_FN_PTRS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_CACHE_STRATEGY"))
+#ifdef LDAP_OPT_CACHE_STRATEGY
+	    return LDAP_OPT_CACHE_STRATEGY;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_CLIENT_CONTROLS"))
+#ifdef LDAP_OPT_CLIENT_CONTROLS
+	    return LDAP_OPT_CLIENT_CONTROLS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_DEREF"))
+#ifdef LDAP_OPT_DEREF
+	    return LDAP_OPT_DEREF;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_DESC"))
+#ifdef LDAP_OPT_DESC
+	    return LDAP_OPT_DESC;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_DNS"))
+#ifdef LDAP_OPT_DNS
+	    return LDAP_OPT_DNS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_DNS_FN_PTRS"))
+#ifdef LDAP_OPT_DNS_FN_PTRS
+	    return LDAP_OPT_DNS_FN_PTRS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_ERROR_NUMBER"))
+#ifdef LDAP_OPT_ERROR_NUMBER
+	    return LDAP_OPT_ERROR_NUMBER;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_ERROR_STRING"))
+#ifdef LDAP_OPT_ERROR_STRING
+	    return LDAP_OPT_ERROR_STRING;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_HOST_NAME"))
+#ifdef LDAP_OPT_HOST_NAME
+	    return LDAP_OPT_HOST_NAME;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_IO_FN_PTRS"))
+#ifdef LDAP_OPT_IO_FN_PTRS
+	    return LDAP_OPT_IO_FN_PTRS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_MEMALLOC_FN_PTRS"))
+#ifdef LDAP_OPT_MEMALLOC_FN_PTRS
+	    return LDAP_OPT_MEMALLOC_FN_PTRS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_PREFERRED_LANGUAGE"))
+#ifdef LDAP_OPT_PREFERRED_LANGUAGE
+	    return LDAP_OPT_PREFERRED_LANGUAGE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_PROTOCOL_VERSION"))
+#ifdef LDAP_OPT_PROTOCOL_VERSION
+	    return LDAP_OPT_PROTOCOL_VERSION;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_REBIND_ARG"))
+#ifdef LDAP_OPT_REBIND_ARG
+	    return LDAP_OPT_REBIND_ARG;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_REBIND_FN"))
+#ifdef LDAP_OPT_REBIND_FN
+	    return LDAP_OPT_REBIND_FN;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_RECONNECT"))
+#ifdef LDAP_OPT_RECONNECT
+	    return LDAP_OPT_RECONNECT;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_REFERRALS"))
+#ifdef LDAP_OPT_REFERRALS
+	    return LDAP_OPT_REFERRALS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_REFERRAL_HOP_LIMIT"))
+#ifdef LDAP_OPT_REFERRAL_HOP_LIMIT
+	    return LDAP_OPT_REFERRAL_HOP_LIMIT;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_RESTART"))
+#ifdef LDAP_OPT_RESTART
+	    return LDAP_OPT_RESTART;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_RETURN_REFERRALS"))
+#ifdef LDAP_OPT_RETURN_REFERRALS
+	    return LDAP_OPT_RETURN_REFERRALS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_SERVER_CONTROLS"))
+#ifdef LDAP_OPT_SERVER_CONTROLS
+	    return LDAP_OPT_SERVER_CONTROLS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_SIZELIMIT"))
+#ifdef LDAP_OPT_SIZELIMIT
+	    return LDAP_OPT_SIZELIMIT;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_SSL"))
+#ifdef LDAP_OPT_SSL
+	    return LDAP_OPT_SSL;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_THREAD_FN_PTRS"))
+#ifdef LDAP_OPT_THREAD_FN_PTRS
+	    return LDAP_OPT_THREAD_FN_PTRS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OPT_TIMELIMIT"))
+#ifdef LDAP_OPT_TIMELIMIT
+	    return LDAP_OPT_TIMELIMIT;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_OTHER"))
+#ifdef LDAP_OTHER
+	    return LDAP_OTHER;
+#else
+	    goto not_there;
+#endif
+	break;
+      case 'P':
+	if (strEQ(name, "LDAP_PARAM_ERROR"))
+#ifdef LDAP_PARAM_ERROR
+	    return LDAP_PARAM_ERROR;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_PARTIAL_RESULTS"))
+#ifdef LDAP_PARTIAL_RESULTS
+	    return LDAP_PARTIAL_RESULTS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_PORT"))
+#ifdef LDAP_PORT
+	    return LDAP_PORT;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_PORT_MAX"))
+#ifdef LDAP_PORT_MAX
+	    return LDAP_PORT_MAX;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_PROTOCOL_ERROR"))
+#ifdef LDAP_PROTOCOL_ERROR
+	    return LDAP_PROTOCOL_ERROR;
+#else
+	    goto not_there;
+#endif
+	break;
+      case 'R':
+	if (strEQ(name, "LDAP_REFERRAL"))
+#ifdef LDAP_REFERRAL
+	    return LDAP_REFERRAL;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_REFERRAL_LIMIT_EXCEEDED"))
+#ifdef LDAP_REFERRAL_LIMIT_EXCEEDED
+	    return LDAP_REFERRAL_LIMIT_EXCEEDED;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_RESULTS_TOO_LARGE"))
+#ifdef LDAP_RESULTS_TOO_LARGE
+	    return LDAP_RESULTS_TOO_LARGE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_RES_ADD"))
+#ifdef LDAP_RES_ADD
+	    return LDAP_RES_ADD;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_RES_ANY"))
+#ifdef LDAP_RES_ANY
+	    return LDAP_RES_ANY;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_RES_BIND"))
+#ifdef LDAP_RES_BIND
+	    return LDAP_RES_BIND;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_RES_COMPARE"))
+#ifdef LDAP_RES_COMPARE
+	    return LDAP_RES_COMPARE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_RES_DELETE"))
+#ifdef LDAP_RES_DELETE
+	    return LDAP_RES_DELETE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_RES_EXTENDED"))
+#ifdef LDAP_RES_EXTENDED
+	    return LDAP_RES_EXTENDED;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_RES_MODIFY"))
+#ifdef LDAP_RES_MODIFY
+	    return LDAP_RES_MODIFY;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_RES_MODRDN"))
+#ifdef LDAP_RES_MODRDN
+	    return LDAP_RES_MODRDN;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_RES_RENAME"))
+#ifdef LDAP_RES_RENAME
+	    return LDAP_RES_RENAME;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_RES_SEARCH_ENTRY"))
+#ifdef LDAP_RES_SEARCH_ENTRY
+	    return LDAP_RES_SEARCH_ENTRY;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_RES_SEARCH_REFERENCE"))
+#ifdef LDAP_RES_SEARCH_REFERENCE
+	    return LDAP_RES_SEARCH_REFERENCE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_RES_SEARCH_RESULT"))
+#ifdef LDAP_RES_SEARCH_RESULT
+	    return LDAP_RES_SEARCH_RESULT;
+#else
+	    goto not_there;
+#endif
+	break;
+      case 'S':
+	if (strEQ(name, "LDAP_SASL_BIND_IN_PROGRESS"))
+#ifdef LDAP_SASL_BIND_IN_PROGRESS
+	    return LDAP_SASL_BIND_IN_PROGRESS;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_SASL_SIMPLE"))
+#ifdef LDAP_SASL_SIMPLE
+	    return LDAP_SASL_SIMPLE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_SCOPE_BASE"))
+#ifdef LDAP_SCOPE_BASE
+	    return LDAP_SCOPE_BASE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_SCOPE_ONELEVEL"))
+#ifdef LDAP_SCOPE_ONELEVEL
+	    return LDAP_SCOPE_ONELEVEL;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_SCOPE_SUBTREE"))
+#ifdef LDAP_SCOPE_SUBTREE
+	    return LDAP_SCOPE_SUBTREE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_SECURITY_NONE"))
+#ifdef LDAP_SECURITY_NONE
+	    return LDAP_SECURITY_NONE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_SERVER_DOWN"))
+#ifdef LDAP_SERVER_DOWN
+	    return LDAP_SERVER_DOWN;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_SIZELIMIT_EXCEEDED"))
+#ifdef LDAP_SIZELIMIT_EXCEEDED
+	    return LDAP_SIZELIMIT_EXCEEDED;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_SORT_CONTROL_MISSING"))
+#ifdef LDAP_SORT_CONTROL_MISSING
+	    return LDAP_SORT_CONTROL_MISSING;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_STRONG_AUTH_NOT_SUPPORTED"))
+#ifdef LDAP_STRONG_AUTH_NOT_SUPPORTED
+	    return LDAP_STRONG_AUTH_NOT_SUPPORTED;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_STRONG_AUTH_REQUIRED"))
+#ifdef LDAP_STRONG_AUTH_REQUIRED
+	    return LDAP_STRONG_AUTH_REQUIRED;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_SUCCESS"))
+#ifdef LDAP_SUCCESS
+	    return LDAP_SUCCESS;
+#else
+	    goto not_there;
+#endif
+	break;
+      case 'T':
+	if (strEQ(name, "LDAP_TIMELIMIT_EXCEEDED"))
+#ifdef LDAP_TIMELIMIT_EXCEEDED
+	    return LDAP_TIMELIMIT_EXCEEDED;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_TIMEOUT"))
+#ifdef LDAP_TIMEOUT
+	    return LDAP_TIMEOUT;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_TYPE_OR_VALUE_EXISTS"))
+#ifdef LDAP_TYPE_OR_VALUE_EXISTS
+	    return LDAP_TYPE_OR_VALUE_EXISTS;
+#else
+	    goto not_there;
+#endif
+	break;
+      case 'U':
+	if (strEQ(name, "LDAP_UNAVAILABLE"))
+#ifdef LDAP_UNAVAILABLE
+	    return LDAP_UNAVAILABLE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_UNAVAILABLE_CRITICAL_EXTENSION"))
+#ifdef LDAP_UNAVAILABLE_CRITICAL_EXTENSION
+	    return LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_UNDEFINED_TYPE"))
+#ifdef LDAP_UNDEFINED_TYPE
+	    return LDAP_UNDEFINED_TYPE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_UNWILLING_TO_PERFORM"))
+#ifdef LDAP_UNWILLING_TO_PERFORM
+	    return LDAP_UNWILLING_TO_PERFORM;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_URL_ERR_BADSCOPE"))
+#ifdef LDAP_URL_ERR_BADSCOPE
+	    return LDAP_URL_ERR_BADSCOPE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_URL_ERR_MEM"))
+#ifdef LDAP_URL_ERR_MEM
+	    return LDAP_URL_ERR_MEM;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_URL_ERR_NODN"))
+#ifdef LDAP_URL_ERR_NODN
+	    return LDAP_URL_ERR_NODN;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_URL_ERR_NOTLDAP"))
+#ifdef LDAP_URL_ERR_NOTLDAP
+	    return LDAP_URL_ERR_NOTLDAP;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_URL_ERR_PARAM"))
+#ifdef LDAP_URL_ERR_PARAM
+	    return LDAP_URL_ERR_PARAM;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_URL_OPT_SECURE"))
+#ifdef LDAP_URL_OPT_SECURE
+	    return LDAP_URL_OPT_SECURE;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_USER_CANCELLED"))
+#ifdef LDAP_USER_CANCELLED
+	    return LDAP_USER_CANCELLED;
+#else
+	    goto not_there;
+#endif
+	break;
+      case 'V':
+	if (strEQ(name, "LDAP_VERSION"))
+#ifdef LDAP_VERSION
+	    return LDAP_VERSION;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_VERSION1"))
+#ifdef LDAP_VERSION1
+	    return LDAP_VERSION1;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_VERSION2"))
+#ifdef LDAP_VERSION2
+	    return LDAP_VERSION2;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_VERSION3"))
+#ifdef LDAP_VERSION3
+	    return LDAP_VERSION3;
+#else
+	    goto not_there;
+#endif
+	if (strEQ(name, "LDAP_VERSION_MAX"))
+#ifdef LDAP_VERSION_MAX
+	    return LDAP_VERSION_MAX;
+#else
+	    goto not_there;
+#endif
+	break;
+      }
+    } else {
+	if (strEQ(name, "LDAPS_PORT"))
+#ifdef LDAPS_PORT
+	    return LDAPS_PORT;
+#else
+	    goto not_there;
+#endif
+    }
+
+    errno = EINVAL;
+    return 0;
+
+not_there:
+    errno = ENOENT;
+    return 0;
+}

mozilla/directory/perldap/examples/ChangeLog

@@ -0,0 +1,35 @@
+1999-06-30  Leif Hedstrom  <leif@netscape.com>
+
+	* rmentry.pl: Added support for "-p".
+
+1999-01-05  Leif Hedstrom  <leif@netscape.com>
+
+	* psoftsync.pl (delAttr): Fixed annoying bug where I missed to
+	"my" $entry.
+
+1999-01-04  Leif Hedstrom  <leif@netscape.com>
+
+	* modattr.pl: Bug fixes for handling bad cases better (like
+	missing attribute, adding empty values etc).
+
+1998-12-11  Leif Hedstrom  <leif@netscape.com>
+
+	* modattr.pl: Modified slightly to enable the rebind proc.
+
+1998-08-03  Leif Hedstrom  <leif@netscape.com>
+
+	* psoftsync.pl: New file, also merged in some modules from
+	LdapUtils.pm, to make sure this works. NOTE: This script currently
+	doesn't work, since all "modify" operations are horked.
+
+1998-07-30  Leif Hedstrom  <leif@netscape.com>
+
+	* tabdump.pl: Actually works!
+
+	* ldappasswd.pl: Cleaned out some code, and moved it over to the
+	::Utils module.
+
+1998-07-29  Leif Hedstrom  <leif@netscape.com>
+
+	* qsearch.pl: First working version.
+

mozilla/directory/perldap/examples/changes2ldif.pl

@@ -0,0 +1,118 @@
+#!/usr/bin/perl5
+#############################################################################
+# $Id: changes2ldif.pl,v 1.2 1999-01-21 23:52:46 leif%netscape.com Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    Search the changelog, and produce an LDIF file suitable for ldapmodify
+#    for instance. This should be merged into LDIF.pm eventually.
+#
+#############################################################################
+
+use Getopt::Std;			# To parse command line arguments.
+use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
+use Mozilla::LDAP::Utils;		# LULU, utilities.
+
+use strict;
+no strict "vars";
+
+
+#################################################################################
+# Constants, shouldn't have to edit these...
+#
+$APPNAM	= "changes2ldif";
+$USAGE	= "$APPNAM [-nv] -b base -h host -D bind -w pswd -P cert [min [max]]";
+
+
+#################################################################################
+# Check arguments, and configure some parameters accordingly..
+#
+if (!getopts('nvb:h:D:p:s:w:P:'))
+{
+   print "usage: $APPNAM $USAGE\n";
+   exit;
+}
+%ld = Mozilla::LDAP::Utils::ldapArgs();
+$ld{root} = "cn=changelog" if (!defined($ld{root}) || $ld{root} eq "");
+
+
+#################################################################################
+# Instantiate an LDAP object, which also binds to the LDAP server.
+#
+$conn = new Mozilla::LDAP::Conn(\%ld);
+die "Could't connect to LDAP server $ld{host}" unless $conn;
+
+
+#################################################################################
+# Create the search filter.
+#
+$min = $ARGV[$[];
+$max = $ARGV[$[ + 1];
+
+if ($min ne "")
+{
+  if ($max ne "")
+    {
+      $search = "(&(changenumber>=$min)(changenumber<=$max))";
+    }
+  else
+    {
+      $search = "(changenumber>=$min)";
+    }
+}
+else
+{
+  $search = "(changenumber=*)";
+}
+  
+
+#################################################################################
+# Do the searches, and print the results.
+#
+$entry = $conn->search($ld{root}, "ONE", "$search");
+while ($entry)
+{
+  print "dn: ", $entry->{targetdn}[0], "\n";
+  $type = $entry->{changetype}[0];
+  print "changetype: $type\n";
+  if ($type =~ /modify/i)
+    {
+      # Should we filter out modifiersname and modifytimestamp ? We do chop
+      # off the trailing \0 though.
+      chop($entry->{changes}[0]);
+      print $entry->{changes}[0], "\n";
+    }
+  elsif ($type =~ /add/i)
+    {
+      print $entry->{changes}[0], "\n";
+    }
+  else
+    {
+      print "\n";
+    }
+
+  $entry = $conn->nextEntry;
+}
+
+
+#################################################################################
+# Close the connection.
+#
+$ld{conn}->close if $ld{conn};

mozilla/directory/perldap/examples/ldappasswd.pl

@@ -0,0 +1,104 @@
+#!/usr/bin/perl5
+#############################################################################
+# $Id: ldappasswd.pl,v 1.6 1998-08-13 09:13:23 leif Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    This is an LDAP version of the normal passwd/yppasswd command found
+#    on most Unix systems. Note that this will only use the {crypt}
+#    encryption/hash algorithm (at this point).
+#
+#############################################################################
+
+use Getopt::Std;			# To parse command line arguments.
+use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
+use Mozilla::LDAP::Utils;		# LULU, utilities.
+
+
+#############################################################################
+# Constants, shouldn't have to edit these...
+#
+$APPNAM	= "ldappasswd";
+$USAGE	= "$APPNAM [-nv] -b base -h host -D bind -w pswd -P cert search ...";
+
+@ATTRIBUTES = ("uid", "userpassword");
+
+
+#############################################################################
+# Check arguments, and configure some parameters accordingly..
+#
+if (!getopts('nvb:s:h:D:w:P:')) {
+   print "usage: $APPNAM $USAGE\n";
+   exit;
+}
+%ld = Mozilla::LDAP::Utils::ldapArgs();
+Mozilla::LDAP::Utils::userCredentials(\%ld) unless $opt_n;
+
+
+#############################################################################
+# Ask for the new password, and confirm it's correct.
+#
+do
+{
+  print "New password: ";
+  $new = Mozilla::LDAP::Utils::askPassword();
+  print "New password (again): ";
+  $new2 = Mozilla::LDAP::Utils::askPassword();
+  print "Passwords didn't match, try again!\n\n" if ($new ne $new2);
+} until ($new eq $new2);
+print "\n";
+
+$crypted = Mozilla::LDAP::Utils::unixCrypt("$new");
+
+
+#############################################################################
+# Now do all the searches, one by one. If there are no search criteria, we
+# will change the password for the user running the script.
+#
+$conn = new Mozilla::LDAP::Conn(\%ld);
+die "Could't connect to LDAP server $ld{host}" unless $conn;
+
+foreach $search ($#ARGV >= $[ ? @ARGV : $ld{bind})
+{
+  $entry = $conn->search($search, "subtree", "ALL", 0, @ATTRIBUTES);
+  $entry = $conn->search($ld{root}, "subtree", $search, 0, @ATTRIBUTES)
+    unless $entry;
+  print "No such user: $search\n" unless $entry;
+
+  while ($entry)
+    {
+      $entry->{userpassword} = ["{crypt}" . $crypted];
+      print "Changing password for: $entry->{dn}\n" if $opt_v;
+
+      if (!$opt_n)
+	{
+	  $conn->update($entry);
+	  $conn->printError() if $conn->getErrorCode();
+	}
+
+      $entry = $conn->nextEntry();
+    }
+}
+
+
+#############################################################################
+# Close the connection.
+#
+$conn->close if $conn;

mozilla/directory/perldap/examples/lfinger.pl

@@ -0,0 +1,128 @@
+#!/usr/bin/perl5
+#############################################################################
+# $Id: lfinger.pl,v 1.10 1998-08-13 09:13:08 leif Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    "finger" version using LDAP information (using RFC 2307 objectclass).
+#
+#############################################################################
+
+use Getopt::Std;			# To parse command line arguments.
+use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
+use Mozilla::LDAP::Utils;		# LULU, utilities.
+
+
+#############################################################################
+# Constants, shouldn't have to edit these... The HIDE mechanism is a very
+# Netscape internal specific feature. We use this objectclass to mark some
+# entries to be "hidden", and some of our applications will honor this. With
+# more recent versions of the Directory Server this can be accomplished more
+# effectively with appropriate ACI/ACLs.
+#
+$APPNAM	= "lfinger";
+$USAGE	= "$APPNAM -m -b base -h host -D bind -w pswd -P cert user_info";
+
+@ATTRIBUTES = ("uid", "cn", "homedirectory", "loginshell", "pager",
+	       "telephonenumber", "facsimiletelephonenumber", "mobile");
+$HIDE = "(objectclass=nscphidethis)";
+
+
+
+#############################################################################
+# Print a "finger" entry.
+#
+sub printIt
+{
+  my($entry) = @_;
+
+  print "Login name: $entry->{uid}[0]";
+  print " " x (39 - 11 - length($entry->{uid}[0]));
+  print "In real life: $entry->{cn}[0]\n";
+  if ($entry->{homedirectory}[0] || $entry->{loginshell}[0])
+    {
+      print "Directory: $entry->{homedirectory}[0]";
+      print " " x (39 - 10 - length($entry->{homedirectory}[0]));
+      print "Shell: $entry->{loginshell}[0]\n";
+    }
+
+  if ($entry->{telephonenumber}[0] || $entry->{pager}[0])
+    {
+      print "Phone: $entry->{telephonenumber}[0]";
+      print " " x (39 - 6 - length($entry->{telephonenumber}[0]));
+      print "Pager: $entry->{pager}[0]\n";
+    }
+
+  if ($entry->{mobile}[0] || $entry->{facsimiletelephonenumber}[0])
+    {
+      print "Mobile: $entry->{mobile}[0]";
+      print " " x (39 - 7 - length($entry->{mobile}[0]));
+      print "Fax: $entry->{facsimiletelephonenumber}[0]\n";
+    }
+
+  print "\n";
+}
+
+
+#############################################################################
+# Check arguments, and configure some parameters accordingly..
+#
+if (!getopts('mb:h:D:p:w:P:') || !defined($ARGV[$[]))
+{
+   print "usage: $APPNAM $USAGE\n";
+   exit;
+}
+%ld = Mozilla::LDAP::Utils::ldapArgs();
+$user=$ARGV[$[];
+
+
+#############################################################################
+# Instantiate an LDAP object, which also binds to the LDAP server.
+#
+$conn = new Mozilla::LDAP::Conn(\%ld);
+die "Could't connect to LDAP server $ld{host}" unless $conn;
+
+
+#############################################################################
+# Ok, lets generate the filter, and do the search!
+#
+if ($opt_m)
+{
+  $search = "(&(uid=$user)(!$HIDE))";
+}
+else
+{
+  $search = "(&(|(cn=*$user*)(uid=*$user*)(telephonenumber=*$user*))(!$HIDE))";
+}
+
+$entry = $conn->search($ld{root}, "subtree", $search, 0, @ATTRIBUTES);
+$conn->printError() if $conn->getErrorCode();
+
+while($entry)
+{
+  printIt($entry);
+  $entry = $conn->nextEntry();
+}
+
+
+#############################################################################
+# Close the connection.
+#
+$conn->close if $conn;

mozilla/directory/perldap/examples/modattr.pl

@@ -0,0 +1,331 @@
+#!/usr/bin/perl5
+#############################################################################
+# $Id: modattr.pl,v 1.8 1999-01-21 23:52:46 leif%netscape.com Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    This script can be used to do a number of different modification
+#    operations on a script. Like adding/deleting values, or entire
+#    attributes.
+#
+#############################################################################
+
+use Getopt::Std;			# To parse command line arguments.
+use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
+use Mozilla::LDAP::Utils;		# LULU, utilities.
+
+use strict;
+no strict "vars";
+
+
+#############################################################################
+# Constants, shouldn't have to edit these...
+#
+$APPNAM	= "modattr";
+$USAGE	= "$APPNAM [-dnvW] -b base -h host -D bind -w pswd -P cert attr=value filter";
+
+
+#############################################################################
+# Check arguments, and configure some parameters accordingly..
+#
+if (!getopts('adnvWb:h:D:p:s:w:P:'))
+{
+  print "usage: $APPNAM $USAGE\n";
+  exit;
+}
+%ld = Mozilla::LDAP::Utils::ldapArgs();
+Mozilla::LDAP::Utils::userCredentials(\%ld) unless $opt_n;
+
+
+#############################################################################
+# Let's process the changes requested, and commit them unless the "-n"
+# option was given.
+#
+$conn = new Mozilla::LDAP::Conn(\%ld);
+die "Could't connect to LDAP server $ld{host}" unless $conn;
+
+$conn->setDefaultRebindProc($ld{bind}, $ld{pswd});
+
+($change, $search) = @ARGV;
+if (($change eq "") || ($search eq ""))
+{
+  print "usage: $APPNAM $USAGE\n";
+  exit;
+}
+($attr, $value) = split(/=/, $change, 2);
+
+$entry = $conn->search($ld{root}, $ld{scope}, $search);
+while ($entry)
+{
+  $changed = 0;
+
+  if ($opt_d)
+    {
+      if (defined $entry->{$attr})
+	{
+	  if ($value)
+	    {
+	      $changed = $entry->removeValue($attr, $value);
+	      if ($changed && $opt_v)
+		{
+		  print "Removed value from ", $entry->getDN(), "\n" if $opt_v;
+		}
+	    }
+	  else
+	    {
+	      delete $entry->{$attr};
+	      print "Deleted attribute $attr for ", $entry->getDN(), "\n" if $opt_v;
+	      $changed = 1;
+	    }
+	}
+      else
+	{
+	  print "No attribute values for: $attr\n";
+	}
+    }
+  else
+    {
+      if (!defined($value) || !$value)
+	{
+	  print "No value provided for the attribute $attr\n";
+	}
+      elsif ($opt_a)
+	{
+	  $changed = $entry->addValue($attr, $value);
+	  if ($changed && $opt_v)
+	    {
+	      print "Added attribute to ", $entry->getDN(), "\n" if $opt_v;
+	    }
+	}
+      else
+	{
+	  $entry->setValue($attr, $value);
+	  $changed = 1;
+	  print "Set attribute for ", $entry->getDN(), "\n" if $opt_v;
+	}
+    }
+  if ($changed && ! $opt_n)
+    {
+      $conn->update($entry);
+      $conn->printError() if $conn->getErrorCode();
+    }
+
+  $entry = $conn->nextEntry();
+}
+
+
+#############################################################################
+# Close the connection.
+#
+$conn->close if $conn;
+
+
+#############################################################################
+# POD documentation...
+#
+__END__
+
+=head1 NAME
+
+  modattr - Modify an attribute for one or more LDAP entries
+
+=head1 SYNOPSIS
+
+  modattr [-adnvW] -b base -h host -D bind DN -w pwd -P cert attr=value filter
+
+=head1 ABSTRACT
+
+This command line utility can be used to modify one attribute for one or
+more LDAP entries. As simple as this sounds, this turns out to be a very
+common operation. For instance, let's say you want to change "mailHost"
+for all users on a machine named I<dredd>, to be I<judge>. With this
+script all you have to do is
+
+    modattr mailHost=judge '(mailHost=dredd)'
+
+=head1 DESCRIPTION
+
+There are four primary operations that can be made with this utility:
+
+=over 4
+
+=item *
+
+Set an attribute to a (single) specified value.
+
+=item *
+
+Add a value to an attribute (for multi-value attributes).
+
+=item *
+
+Delete a value from an attribute. If it's the last value (or if it's a
+single value), this will remove the entire attribute.
+
+=item *
+
+Delete an entire attribute, even if it has multiple values.
+
+=back
+
+The first three requires an option of the form B<attr=value>, while the
+last one only takes the name of the attribute as the option. The last
+argument is always an LDAP search filter, specifying which entries the
+operation should be applied to.
+
+=head1 OPTIONS
+
+All but the first two command line options for this tool are standard LDAP
+options, to set parameters for the LDAP connection. The two new options
+are I<-a> and I<-d> to add and remove attribute values.
+
+Without either of these two options specified (they are both optional),
+the default action is to set the attribute to the specified value. That
+will effectively remove any existing values for this attribute.
+
+=over 12
+
+=item -a
+
+Specify that the operation is an I<add>, to add a value to the
+attribute. If there is no existing value for this attribute, we'll create
+a new attribute, otherwise we add the new value if it's not already there.
+
+=item -d
+
+Delete the attribute value, or the entire attribute if there's no value
+specified. As you can see this option has two forms, and it's function
+depends on the last arguments. Be careful here, if you forget to specify
+the value to delete, you will remove all of them.
+
+=item -h <host>
+
+Name of the LDAP server to connect to.
+
+=item -p <port>
+
+TCP port for the LDAP connection.
+
+=item -b <DN>
+
+Base DN for the search
+
+=item -D <bind>
+
+User (DN) to bind as. We support a few convenience shortcuts here, like
+I<root>, I<user> and I<repl>.
+
+=item -w <passwd>
+
+This specifies the password to use when connecting to the LDAP
+server. This is strongly discouraged, and without this option the script
+will ask for the password interactively.
+
+=item -s <scope>
+
+Search scope, default is I<sub>, the other possible values are I<base> and
+I<one>. You can also specify the numeric scopes, I<0>, I<1> or I<2>.
+
+=item -P
+
+Use SSL for the LDAP connection, using the specified cert.db file for
+certificate information.
+
+=item -n
+
+Don't do anything, only show the changes that would have been made. This
+is very convenient, and can save you from embarrassing mistakes.
+
+=item -v
+
+Verbose output.
+
+=back
+
+The last two arguments are special for this script. The first
+argument specifies the attribute (and possibly the value) to operate on,
+and the last argument is a properly formed LDAP search filter.
+
+=head1 EXAMPLES
+
+We'll give one example for each of the four operations this script can
+currently handle. Since the script itself is quite flexible, you'll
+probably find you can use this script for a lot of other applications, or
+call it from other scripts. Note that we don't specify any LDAP specific
+options here, we assume you have configured your defaults properly.
+
+To set the I<description> attribute for user "leif", you would do
+
+    modattr 'description=Company Swede' '(uid=leif)'
+
+The examples shows how to use this command without either of the I<-a> or
+the I<-d> argument. To add an e-mail alias (alternate address) to the same
+user, you would do
+
+    modattr -a 'mailAlternateAddress=theSwede@netscape.com' '(uid=leif)'
+
+To remove an object class from all entries which uses it, you could do
+
+    modattr -d 'objectclass=dummyClass' '(objectclass=dummyClass)'
+
+This example is not great, since unless you've assured that no entries
+uses any of the attributes in this class, you'll get schema
+violations. But don't despair, you can use this tool to clean up all
+entries first! To completely remove all usage of an attribute named
+I<dummyAttr>, you'd simply do
+
+    modattr -d dummyAttr '(dummyAttr=*)'
+
+This shows the final format of this command, notice how we don't specify a
+value, to assure that the entire attribute is removed. This is potentially
+dangerous, so again be careful.
+
+=head1 INSTALLATION
+
+In order to use this script, you'll need Perl version 5.004 or later, the
+LDAP SDK, and also the LDAP Perl module (aka PerLDAP). Once you've installed
+these packages, just copy this file to where you keep your admin binaries,
+e.g. /usr/local/bin.
+
+In order to get good performance, you should make sure you have indexes on
+the attributes you typically use with this script. Our experience has been
+that in most cases the standard indexes in the Directory Server are
+sufficient, e.g. I<CN>, I<UID> and I<MAIL>.
+
+=head1 AVAILABILITY
+
+This package can be retrieved from a number of places, including:
+
+    http://www.mozilla.org/directory/
+    Your local CPAN server
+
+=head1 CREDITS
+
+This little tool was developed internally at Netscape, by Leif Hedstrom.
+
+=head1 BUGS
+
+None, of course...
+
+=head1 SEE ALSO
+
+L<Mozilla::LDAP::API> and L<Perl>
+
+=cut

mozilla/directory/perldap/examples/monitor.pl

@@ -0,0 +1,67 @@
+#!/usr/bin/perl5
+#############################################################################
+# $Id: monitor.pl,v 1.2 1998-08-13 09:12:05 leif Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    Ask the directory server for it's monitor entry, to see some
+#    performance and usage stats.
+#
+#############################################################################
+
+use Getopt::Std;			# To parse command line arguments.
+use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
+use Mozilla::LDAP::Utils;		# LULU, utilities.
+
+
+#################################################################################
+# Constants, shouldn't have to edit these...
+#
+$APPNAM	= "monitor";
+$USAGE	= "$APPNAM [-nv] -b base -h host -D bind -w pswd -P cert";
+
+
+#################################################################################
+# Check arguments, and configure some parameters accordingly..
+#
+if (!getopts('b:h:D:p:w:P:'))
+{
+   print "usage: $APPNAM $USAGE\n";
+   exit;
+}
+%ld = Mozilla::LDAP::Utils::ldapArgs("", "cn=monitor");
+
+
+#################################################################################
+# Instantiate an LDAP object, which also binds to the LDAP server, and then
+# do the simple search.
+#
+$conn = new Mozilla::LDAP::Conn(\%ld);
+die "Could't connect to LDAP server $ld{host}" unless $conn;
+
+$entry = $conn->search($ld{root}, "base", "objectclass=*");
+Mozilla::LDAP::Utils::printEntry($entry)
+  if ($entry);
+
+
+#################################################################################
+# Close the connection.
+#
+$conn->close if $conn;

mozilla/directory/perldap/examples/psoftsync.pl

@@ -0,0 +1,615 @@
+#!/usr/bin/perl5
+#############################################################################
+# $Id: psoftsync.pl,v 1.5 1999-01-21 23:52:47 leif%netscape.com Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    Synchronise some LDAP info with a PeopleSoft "dump". This "dump" file
+#    is a "tab" separated file, as generated by an SQL utility on the
+#    Oracle server.
+#
+#############################################################################
+
+use Getopt::Std;			# To parse command line arguments.
+use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
+use Mozilla::LDAP::Utils;		# LULU, utilities.
+
+
+#############################################################################
+# Local configurations, check these out . Note that SYNCS and ORDER has to
+# have the same fields, this is because the hash array doesn't preserve
+# the order of it's entries... :-( The "codes" are bit fields, where the
+# three LSB are used as
+#
+#	 1  Force the update, even if attribute is empty (i.e. delete it)
+#	 2  The attribute is the base for a DN (e.g. "manager").
+#	 4  The attribute should be deleted if the user is not in PeopleSoft.
+#	 8  Don't warn if the attribute is missing in the Psoft file (-W option).
+#	16  Always delete this attribute in the PeopleSoft entry.
+#	32  Delete this attribute if the account has "expired".
+#
+%SYNCS = (
+	  "nscpharold" => 1 + 4,
+	  "uid" => 0,
+	  "" => 0,
+	  "" => 0,
+	  "employeenumber" => 1 + 4 + 32,
+	  "departmentnumber" => 1 + 4,
+	  "" => 0,
+	  "" => 0,
+	  "" => 0,
+	  "manager" => 1 + 2,
+	  "title" => 1 + 4 + 16 + 32,
+	  "ou" =>  1 + 4 + 32,
+	  "businesscategory" => 1 + 4 + 32,
+	  "employeetype" => 0,
+	  "nscppersonexpdate" => 1 + 8
+	  );
+
+@ORDER = (
+	  "nscpharold",
+	  "uid",
+	  "",
+	  "",
+	  "employeenumber",
+	  "departmentnumber",
+	  "",
+	  "",
+	  "",
+	  "manager",
+	  "title",
+	  "ou",
+	  "businesscategory",
+	  "employeetype",
+	  "nscppersonexpdate"
+	  );
+
+# This is used for mapping the employeeType attribute into a readable format.
+%EMPCODES = (
+	     "A" => "Applicant",
+	     "C" => "Contractor",
+	     "E" => "Employee",
+	     "O" => "OEM Partner",
+	     "T" => "Interim",
+	     "V" => "Vendor"
+	     );
+
+# Expiration policy for other attributes, the EXPDELAY is a convenience
+# default setting.
+$EXPDELAY = 24 * 7;
+%EXPIRES = (
+	    "carlicense"		=> $EXPDELAY,
+	    "mailautoreplymode"		=> $EXPDELAY,
+	    "mailautoreplytext"		=> $EXPDELAY,
+	    "mailforwardingaddress"	=> $EXPDELAY,
+	    "facsimiletelephonenumber"	=> $EXPDELAY
+	    );
+	    
+
+$NOTYPE = "Unknown";
+$DELIMITER = "%%";
+$SENDMAIL = "/usr/lib/sendmail";
+
+$SEARCH = "(&(uid=*)(!(objectclass=pseudoAccount)))";
+$MAILTO = "leif\@netscape.com";
+
+#$LDAP_DEBUG = 1;
+
+
+#############################################################################
+# Constants, shouldn't have to edit these...
+#
+$APPNAM	= "psoftsync";
+$USAGE	= "$APPNAM [-nvW] -b base -h host -D bind -w passwd -P cert PS_file";
+
+@ATTRIBUTES = uniq(@ORDER);
+push(@ATTRIBUTES, "objectclass");
+
+$TODAY = `/usr/bin/date '+%Y%m%d'`;
+chop($TODAY);
+
+
+#############################################################################
+# Print an error for the PeopleSoft data. Note that we use the "__XXX__" fields
+# here, to avoid the problem when an attribute is "expired" or modified.
+#
+sub psoftError
+{
+  my ($str, $entry) = @_;
+
+  print "Error: $str: ";
+  print $entry->key(), " (";
+  print $entry->{__employeenumber__}, ", ";
+  print $entry->{__employeetype__}, ", ";
+  print $entry->{__departmentnumber__}, ")\n";
+}
+
+
+#############################################################################
+# Read in a PeopleSoft file, and create all the entries.
+#
+sub readDump
+{
+  my ($file) = @_;
+  my (@info, %entries);
+  my $val;
+
+  if (!open(PSOFT, $file))
+    {
+      print "Error: Can't read file $file\n";
+
+      exit(1);
+    }
+
+  while (<PSOFT>)
+    {
+      next unless /$DELIMITER/;
+
+      @info = split(/\s*%%\s*/);
+      $entry = new PsoftEntry($info[$[]);
+      foreach $attr (@ORDER)
+	{
+	  $val = shift(@info);
+	  next if ($attr eq "");
+
+	  $entry->add($attr, $val, $SYNCS{$attr});
+	}
+      #
+      # Perhaps we should do some sanity checks here on the PeopleSoft data?
+      #
+
+      # Clean up some data if the user has expired ("best before...")
+      if ($entry->expired($entry->{nscppersonexpdate}))
+	{
+	  foreach $attr (@ORDER)
+	    {
+	      next unless $attr;
+
+	      delete($entry->{$attr}) if ($SYNCS{$attr} & 32);
+	    }
+	}
+
+      if ($entry->{uid})
+	{
+	  $entries{$entry->{uid}} = $entry;
+	}
+      elsif ($opt_W)
+	{
+	  psoftError("No UID", $entry);
+	}
+    }
+  close(PSOFT);
+
+  return %entries;
+}
+
+
+#############################################################################
+# Make a list "uniq", just like the Unix command.
+#
+sub uniq {				# uniq(elements[])
+  my %tmp;
+   
+  grep($tmp{$_}++, @_);
+  return sort(keys(%tmp));
+}
+
+
+#############################################################################
+# Delete an attribute from an entry.
+#
+sub delAttr {				# delAttr(ENTRY, ATTR)
+  my ($entry, $attr) = @_;
+
+  if (defined($entry->{$attr}))
+    {
+      $out->write("Deleted $attr for user: $entry->{uid}[0]") if $opt_v;
+      delete($entry->{$attr});
+
+      return 1;
+    }
+
+  return 0;
+}
+
+
+#############################################################################
+# Check arguments, and configure some parameters accordingly..
+#
+if (!getopts('nvMWb:h:D:p:s:w:P:'))
+{
+  print "usage: $APPNAM $USAGE\n";
+  exit;
+}
+%ld = Mozilla::LDAP::Utils::ldapArgs();
+Mozilla::LDAP::Utils::userCredentials(\%ld) unless $opt_n;
+
+$out = new Mail();
+if ($opt_M)
+{
+  $out->set("to", $MAILTO);
+  $out->set("subject", "Hoth: PeopleSoft synchronization report");
+}
+else
+{
+  $out->echo();
+  $out->nomail();
+}
+
+
+#############################################################################
+# Read in all the PeopleSoft entries, and then instantiate an LDAP object,
+# which also binds to the LDAP server.
+#
+%psoft = readDump(@ARGV[$[]);
+$conn = new Mozilla::LDAP::Conn(\%ld);
+die "Could't connect to LDAP server $ld{host}" unless $conn;
+
+
+#############################################################################
+# Now process all the users, one by one.
+#
+$entry = $conn->search($ld{root}, "subtree", $SEARCH, 0, @ATTRIBUTES);
+
+while ($entry)
+{
+  $uid = $entry->{"uid"}[0];
+  $changed = 0;
+
+  $psent = $psoft{$uid};
+  if (!$psent)
+    {
+      print "Error: LDAP user $uid: No entry in PeopleSoft\n" if $opt_W;
+      foreach $attr (@ORDER)
+	{
+	  next unless $attr;
+	  $changed += delAttr($entry, $attr) if ($SYNCS{$attr} & 4);
+	}
+      if ($entry->{employeetype}[0] ne "$NOTYPE")
+	{
+	  $entry->{employeetype} = ["$NOTYPE"];
+	  $changed = 1;
+	  $out->write("Set employeeType to $NOTYPE for user: $uid") if $opt_v;
+	}
+	  
+    }
+  else
+    {
+      $psent->handled(1);
+      foreach $attr (@ORDER)
+	{
+	  next unless $attr;
+
+	  if (!defined($psent->{$attr}) || ($psent->{$attr} eq ""))
+	    {
+	      $changed += delAttr($entry, $attr) if ($SYNCS{$attr} & 1);
+	    }
+	  elsif ($entry->{$attr}[0] ne $psent->{$attr})
+	    {
+	      $entry->{$attr} = [$psent->{$attr}];
+	      $changed = 1;
+	      $out->write("Set $attr to $psent->{$attr} for user: $uid") if $opt_v;
+	    }
+	}
+      # Now handle the Expire date special case...
+      if ($psent->expired() ne "")
+	{
+	  if ($entry->addValue("objectclass", "nscphidethis"))
+	    {
+	      $changed = 1;
+	      $out->write("Expiring the user: $uid") if $opt_v;
+	    }
+
+	  # Expire other attributes, IFF the expire is over a certain
+	  # treshhold (e.g. a week).
+	}
+      elsif ($entry->removeValue("objectclass", "nscphidethis"))
+	{
+	  $changed = 1;
+	  $out->write("Enabling the user: $uid") if $opt_v;
+	}
+    }
+
+  $conn->update($entry) if ($changed && ! $opt_n);
+  $entry = $conn->nextEntry();
+}
+
+
+#############################################################################
+# Close the LDAP connection.
+#
+$conn->close if $conn;
+
+
+#############################################################################
+# Post process, figure out which PSoft entries have no entry in LDAP.
+#
+if ($opt_W)
+{
+  foreach (keys(%psoft))
+    {
+      $ent=$psoft{$_};
+      
+      psoftError("No LDAP entry", $ent) unless $ent->handled();
+    }
+}
+
+
+
+#############################################################################
+# Package to an entry from the PeopleSoft database.
+#
+package PsoftEntry;
+
+
+#############################################################################
+# Creator.
+#
+sub new
+{
+  my ($class, $key) = @_;
+  my $self = {};
+  
+  bless $self, ref $class || $class;
+  $self->{__key__} = $key;
+
+  return $self;
+}
+
+
+#############################################################################
+# Add an attribute/field to the entry.
+#
+sub add
+{
+  my ($self, $attr, $val, $lev) = @_;
+
+  return if ($lev & 16);
+
+  $attr = lc $attr;
+  if ($attr eq "employeetype")
+    {
+      if (defined($main::EMPCODES{$val}))
+	{
+	  $self->{$attr} = $main::EMPCODES{$val};
+	}
+      else
+	{
+	  $self->{$attr} = $main::NOTYPE;
+	}
+      $self->{__employeetype__} = $val;
+    }
+  elsif (!defined($val) || ($val eq ""))
+    {
+      main::psoftError("No attribute $attr", $self)
+	if ($main::opt_W && ($lev & 1) && !($lev & 8));
+    }
+  else
+    {
+      $self->{$attr} = ($lev & 2) ? "uid=$val,$main::ld{root}" : $val;
+      $self->{"__${attr}__"} = $val;
+    }
+}
+
+
+#############################################################################
+# Return the value for an attribute/field.
+#
+sub get
+{
+  my ($self, $attr) = @_;
+
+  return $self->{$attr};
+}
+
+
+#############################################################################
+# Mark the entry as "expired". If there is no "date" argument, we'll return
+# the current entries expire status.
+#
+sub expired
+{
+  my ($self, $date) = @_;
+
+  if ($date)
+    {
+      # Only expire entries with reasonable expire dates...
+      if (length($date) != 8)
+	{
+	  main::psoftError("Bad expire date", $self) if $main::opt_W;
+
+	  return 0;
+	}
+
+      if ($date lt $main::TODAY)
+	{
+	  $self->{employeetype} = "$main::NOTYPE";
+	  $self->{__expired__} = 1;
+
+	  return 1;
+	}
+    }
+
+  return $self->{__expired__};
+}
+
+
+#############################################################################
+# Mark the entry as "handled", i.e. it exists in LDAP.
+#
+sub handled
+{
+  my ($self, $flag) = @_;
+
+  $self->{__handled__} = 1 if $flag;
+
+  return $self->{__handled__};
+}
+
+
+#############################################################################
+# Return the "key" of this entry, typically the name field.
+#
+sub key
+{
+  my ($self) = @_;
+
+  return $self->{__key__};
+}
+
+
+#################################################################################
+# This sub-package will send mail to some recipients, IFF there is anything to
+# send, or your force it to send. Note that the Subject doesn't qualify it to
+# send a message (force it to send if you have to).
+#
+package Mail;
+
+
+#################################################################################
+# The constructor, which optionally takes the TO, FROM and SUBJECT.
+#
+sub new
+{
+  my ($class, $to, $from, $subject) = @_;
+  my $self = {};
+
+  bless $self, ref $class || $class;
+
+  $self->{to} = $to || "root";
+  $self->{from} = $from || "ldap";
+  $self->{subject} = $subject || "Output from LDAP script\n";
+  @{$self->{message}} = ();
+  $self->{send} = 0;
+  $self->{nomail} = 0;
+  $self->{echo} = 0;
+
+  return $self;
+}
+
+
+#################################################################################
+# Destructor, which will also send the message, if appropriate.
+#
+sub DESTROY
+{
+  my ($self) = @_;
+
+  if ($self->{send} && !$self->{nomail})
+    {
+      $self->send();
+      $self->{send} = 0;
+    }
+}
+
+
+#################################################################################
+# Set a field for this entry, e.g. From:, To: etc.
+#
+sub set
+{
+  my ($self, $field, $string) = @_;
+
+  if ($field && $string)
+    {
+      $field = lc $field;
+      $self->{$field} = $string;
+    }
+}
+
+
+#################################################################################
+# Add a line to the message, the argument is the string.
+#
+sub write
+{
+  my ($self, $string) = @_;
+
+  if ($string ne "")
+    {
+      push(@{$self->{message}}, $string);
+      print "$string\n" if $self->{echo};
+
+      $self->{send}++;
+    }
+}
+
+
+#################################################################################
+# Force the object to send the message, no matter if there's anything in the
+# body or not.
+#
+sub force
+{
+  my ($self) = @_;
+
+  $self->{send} = 1;
+  $self->{nomail} = 0;
+}
+
+
+#################################################################################
+# Don't send the mail, this is the oppositte to "force...
+#
+sub nomail
+{
+  my ($self) = @_;
+
+  $self->{send} = 0;
+  $self->{nomail} = 1;
+}
+
+
+#################################################################################
+# Enable echo-mode, where we will also print everything to STDOUT.
+#
+sub echo
+{
+  my ($self) = @_;
+
+  $self->{echo} = 1;
+}
+
+
+#################################################################################
+# Actually send the message. This is automatically done by the DESTROY method,
+# but we can force it to do it this way.
+#
+sub send
+{
+  my ($self) = @_;
+
+  if ($self->{send} && !$self->{nomail})
+    {
+      open(MAILER, "|$main::SENDMAIL -t");
+      print MAILER "From: $self->{from}\n";
+      print MAILER "To: $self->{to}\n";
+      print MAILER "Subject: $self->{subject}\n\n";
+
+      foreach (@{$self->{message}})
+	{
+	  print MAILER "$_\n";
+	}
+      print MAILER ".\n";
+
+      close(MAILER);
+      $self->{send} = 0;
+    }
+}

mozilla/directory/perldap/examples/qsearch.pl

@@ -0,0 +1,98 @@
+#!/usr/bin/perl5
+#############################################################################
+# $Id: qsearch.pl,v 1.8 1999-01-21 23:52:47 leif%netscape.com Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    Quick Search, like ldapsearch, but in Perl. Look how simple it is.
+#
+#############################################################################
+
+use Getopt::Std;			# To parse command line arguments.
+use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
+use Mozilla::LDAP::Utils;		# LULU, utilities.
+
+use strict;
+no strict "vars";
+
+
+#################################################################################
+# Constants, shouldn't have to edit these...
+#
+$APPNAM	= "qsearch";
+$USAGE	= "$APPNAM -b base -h host -D bind -w pswd -P cert filter [attr...]";
+
+
+#################################################################################
+# Check arguments, and configure some parameters accordingly..
+#
+if (!getopts('b:h:D:p:s:w:P:'))
+{
+   print "usage: $APPNAM $USAGE\n";
+   exit;
+}
+%ld = Mozilla::LDAP::Utils::ldapArgs();
+
+
+#################################################################################
+# Now do all the searches, one by one.
+#
+$conn = new Mozilla::LDAP::Conn(\%ld);
+die "Could't connect to LDAP server $ld{host}" unless $conn;
+
+foreach (@ARGV)
+{
+  if (/\=/)
+    {
+      push(@srch, $_);
+    }
+  else
+    {
+      push(@attr, $_);
+    }
+}
+
+foreach $search (@srch)
+{
+  if ($#attr >= $[)
+    {
+      $entry = $conn->search($ld{root}, $ld{scope}, $search, 0, @attr);
+    }
+  else
+    {
+      $entry = $conn->search($ld{root}, $ld{scope}, "$search");
+    }
+
+  print "Searched for `$search':\n\n";
+  $conn->printError() if $conn->getErrorCode();
+
+  while ($entry)
+    {
+      $entry->printLDIF();
+      $entry = $conn->nextEntry;
+    }
+  print "\n";
+}
+
+
+#################################################################################
+# Close the connection.
+#
+$conn->close if $conn;

mozilla/directory/perldap/examples/rand_mods.pl

@@ -0,0 +1,135 @@
+#!/usr/bin/perl5
+#################################################################################
+# $Id: rand_mods.pl,v 1.2 1999-08-24 22:30:51 leif%netscape.com Exp $
+#
+# The contents of this file are subject to the Netscape Public License Version
+# 1.0 (the "License"); you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at http://www.mozilla.org/NPL/ 
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+# the specific language governing rights and limitations under the License. 
+#
+# The Initial Developer of the Original Code is Netscape Communications
+# Corporation. Portions created by Netscape are Copyright (C) 1998 Netscape
+# Communications Corporation. All Rights Reserved.
+#
+# SYNOPSIS:
+#    Modify an attribute for one or more entries, or possibly delete it.
+#
+# USAGE:
+#    rand_mods [-adnvW] -b base -h host -D bind DN -w pwd -P cert filter loops
+#		attribute ...
+#
+#################################################################################
+
+
+#################################################################################
+# Modules we need. Note that we depend heavily on the Ldapp module, 
+# which needs to be built from the C code. It also requires an LDAP SDK.
+#
+use Getopt::Std;			# To parse command line arguments.
+use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
+use Mozilla::LDAP::Utils;		# LULU, utilities.
+use Carp;
+
+use strict;
+no strict "vars";
+
+
+#################################################################################
+# Constants, shouldn't have to edit these...
+#
+$APPNAM	= "rand_mods";
+$USAGE	= "$APPNAM [-dnvW] -b base -h host -D bind -w pswd filter loops attr ...";
+$AUTHOR	= "Leif Hedstrom <leif\@netscape.com>";
+
+
+#################################################################################
+# Check arguments, and configure some parameters accordingly..
+#
+if (!getopts('adnvWb:h:D:p:s:w:P:'))
+{
+  print "usage: $APPNAM $USAGE\n";
+  exit;
+}
+%ld = Mozilla::LDAP::Utils::ldapArgs();
+
+
+#################################################################################
+# Instantiate an LDAP object, which also binds to the LDAP server.
+#
+if (!getopts('b:h:D:p:s:w:P:'))
+{
+   print "usage: $APPNAM $USAGE\n";
+   exit;
+}
+%ld = Mozilla::LDAP::Utils::ldapArgs();
+$conn = new Mozilla::LDAP::Conn(\%ld);
+croak "Could't connect to LDAP server $ld{host}" unless $conn;
+
+
+#################################################################################
+# Parse some extra argumens
+#
+my $srch, $loop;
+my (@attrs) = ("givenName", "sn");
+
+if (! ($srch = shift(@ARGV)))
+{
+  print "Usage: $APPNAME $USAGE\n";
+  exit;
+}
+$srch = "(&(!(objectclass=nscpHideThis))(uid=*))" if ($srch eq "");
+
+if (! ($loops = shift(@ARGV)))
+{
+  print "Usage: $APPNAME $USAGE\n";
+  exit;
+}
+
+@attrs = @ARGV if ($#ARGV > $[);
+$num_attrs = $#attrs;
+
+
+#################################################################################
+# Find all the argument
+#
+my $num = 0;
+$entry = $conn->search($ld{root}, $ld{scope}, $srch, 0, ("0.0"));
+while ($entry)
+{
+  push(@users, $entry->getDN());
+  $num++;
+  $entry = $conn->nextEntry();
+}
+
+print "Found $num users, randomizing changes now...\n";
+
+srand(time ^ $$);
+
+my $tmp, $tmp2, $dn, $loop2;
+while ($loops--)
+{
+  $dn = $users[rand($num)];
+
+  print "$loops loops left...\n" if (($loops % 100) == 0);
+  $entry = $conn->browse($dn, @attrs);
+
+  if ($entry)
+    {
+      $loop2 = $num_attrs + 1;
+      while ($loop2--)
+	{
+	  $tmp = $entry->{$attrs[$loop2]}[0];
+	  $tmp2 = rand($num_attrs);
+
+	  $entry->{$attrs[$loop2]} = [ $entry->{$attrs[$tmp2]}[0] ];
+	  $entry->{$attrs[$tmp2]} = [ $tmp] ;
+
+	  $entry->printLDIF();
+	}
+
+      $conn->update($entry);
+    }
+}

mozilla/directory/perldap/examples/rename.pl

@@ -0,0 +1,98 @@
+#!/usr/bin/perl5
+#############################################################################
+# $Id: rename.pl,v 1.4 1999-01-21 23:52:47 leif%netscape.com Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    Rename an LDAP entry, changing it's DN. Note that currently this only
+#    works with RDNs.
+#
+#############################################################################
+
+use Getopt::Std;			# To parse command line arguments.
+use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
+use Mozilla::LDAP::Utils;		# LULU, utilities.
+
+
+#############################################################################
+# Constants, shouldn't have to edit these...
+#
+$APPNAM	= "rename";
+$USAGE	= "$APPNAM [-nvI] -b base -h host -D bind -w pswd -P cert filter new_rdn";
+
+
+#############################################################################
+# Check arguments, and configure some parameters accordingly..
+#
+if (!getopts('nvIb:h:D:w:P:'))
+{
+  print "usage: $APPNAM $USAGE\n";
+  exit;
+}
+%ld = Mozilla::LDAP::Utils::ldapArgs();
+Mozilla::LDAP::Utils::userCredentials(\%ld) unless $opt_n;
+
+($search, $rdn) = @ARGV;
+if (($search eq "") || ($rdn eq ""))
+{
+  print "usage: $APPNAM $USAGE\n";
+  exit;
+}
+
+
+#############################################################################
+# Instantiate an LDAP object, which also binds to the LDAP server.
+#
+$conn = new Mozilla::LDAP::Conn(\%ld);
+die "Could't connect to LDAP server $ld{host}" unless $conn;
+
+$key = "Y" if $opt_I;
+$entry = $conn->search($ld{root}, $ld{scope}, $search, 0, @ATTRIBUTES);
+$conn->printError() if $conn->getErrorCode();
+
+if (! $entry || $conn->nextEntry())
+{
+  print "Error: The search did not return exactly one match, abort!\n";
+  exit;
+}
+
+if (! $opt_I)
+{
+  print "Rename ", $entry->getDN(), " with $rdn [N]? ";
+  $key = Mozilla::LDAP::Utils::answer("N") unless $opt_I;
+}
+
+if ($key eq "Y")
+{
+  # Note: I have to explicitly specify the original DN below, since the call
+  # to nextEntry() above blows the DN away from the ::Conn object.
+  if (! $opt_n)
+    {
+      $conn->modifyRDN($rdn, $entry->getDN());
+      $conn->printError() if $conn->getErrorCode();
+    }
+  print "Renamed $entry->{dn}\n" if $opt_v;
+}
+
+
+#################################################################################
+# Close the connection.
+#
+$conn->close if $conn;

mozilla/directory/perldap/examples/rmentry.pl

@@ -0,0 +1,95 @@
+#!/usr/bin/perl5
+#############################################################################
+# $Id: rmentry.pl,v 1.5 1999-08-24 22:30:51 leif%netscape.com Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    Remove one or several LDAP objects. By default this tool is
+#    interactive, which can be disabled with the "-I" option (but
+#    please be careful...).
+#
+#############################################################################
+
+use Getopt::Std;			# To parse command line arguments.
+use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
+use Mozilla::LDAP::Utils;		# LULU, utilities.
+
+
+#################################################################################
+# Constants, shouldn't have to edit these...
+#
+$APPNAM	= "rmentry";
+$USAGE	= "$APPNAM [-nvI] -b base -h host -p port -D bind -w pswd" .
+          "-P cert filter ...";
+
+@ATTRIBUTES = ("uid");
+
+
+#################################################################################
+# Check arguments, and configure some parameters accordingly..
+#
+if (!getopts('nvIb:h:p:D:w:P:'))
+{
+  print "usage: $APPNAM $USAGE\n";
+  exit;
+}
+%ld = Mozilla::LDAP::Utils::ldapArgs();
+Mozilla::LDAP::Utils::userCredentials(\%ld) unless $opt_n;
+
+
+#################################################################################
+# Do the search, and process all the entries.
+#
+$conn = new Mozilla::LDAP::Conn(\%ld);
+die "Could't connect to LDAP server $ld{host}" unless $conn;
+
+$key = "Y" if $opt_I;
+foreach $search (@ARGV)
+{
+  $entry = $conn->search($ld{root}, $ld{scope}, $search, 0, @ATTRIBUTES);
+  $conn->printError() if $conn->getErrorCode();
+
+  while ($entry)
+    {
+      if (! $opt_I)
+	{
+	  print "Delete $entry->{dn} [N]? ";
+	  $key = Mozilla::LDAP::Utils::answer("N") unless $opt_I;
+	}
+
+      if ($key eq "Y")
+	{
+	  if (! $opt_n)
+	    {
+	      $conn->delete($entry);
+	      $conn->printError() if $conn->getErrorCode();
+	    }
+	  print "Deleted $entry->{dn}\n" if $opt_v;
+	}
+
+      $entry = $conn->nextEntry();
+    }
+}
+
+
+#################################################################################
+# Close the connection.
+#
+$conn->close if $conn;

mozilla/directory/perldap/examples/tabdump.pl

@@ -0,0 +1,81 @@
+#!/usr/bin/perl5
+#############################################################################
+# $Id: tabdump.pl,v 1.3 1998-08-13 09:11:10 leif Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    Generate a TAB separate "dump" of entries matching the search criteria,
+#    using the list of attributes specified.
+#
+#############################################################################
+
+use Getopt::Std;			# To parse command line arguments.
+use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
+use Mozilla::LDAP::Utils;		# LULU, utilities.
+
+
+#################################################################################
+# Constants, shouldn't have to edit these...
+#
+$APPNAM	= "tabdump";
+$USAGE	= "$APPNAM [-nv] -b base -h host -D bind -w pswd -P cert attr1,attr2,.. srch";
+
+
+#################################################################################
+# Check arguments, and configure some parameters accordingly..
+#
+if (!getopts('nvb:h:D:p:s:w:P:'))
+{
+   print "usage: $APPNAM $USAGE\n";
+   exit;
+}
+%ld = Mozilla::LDAP::Utils::ldapArgs();
+
+$attributes = $ARGV[$[];
+$search = $ARGV[$[ + 1];
+die "Need to specify a list of attributes and the search filter.\n"
+  unless ($attributes && $search);
+
+
+#################################################################################
+# Do the searches, and produce the output.
+#
+$conn = new Mozilla::LDAP::Conn(\%ld);
+die "Could't connect to LDAP server $ld{host}" unless $conn;
+
+@attr = split(/,/, $attributes);
+$entry = $conn->search($ld{root}, $ld{scope}, $search, 0, @attr);
+$conn->printError() if $conn->getErrorCode();
+
+while ($entry)
+{
+  foreach (@attr)
+    {
+      print $entry->{$_}[0], "\t";
+    }
+  print "\n";
+  $entry = $conn->nextEntry;
+}
+
+
+#################################################################################
+# Close the connection.
+#
+$conn->close if $conn;

mozilla/directory/perldap/oldtest.pl

@@ -0,0 +1,162 @@
+#############################################################################
+# $Id: oldtest.pl,v 1.2 1999-08-24 22:30:48 leif%netscape.com Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    Before `make install' is performed this script should be runnable with
+#    `make test'. After `make install' it should work as `perl test.pl'
+#
+#############################################################################
+
+######################### We start with some black magic to print on failure.
+
+# Change 1..1 below to 1..last_test_to_print .
+# (It may become useful if the test is moved to ./t subdirectory.)
+
+BEGIN { $| = 1; print "1..8\n"; }
+END {print "modinit  - not ok\n" unless $loaded;}
+use Mozilla::LDAP::API qw(:constant :api :ssl);
+$loaded = 1;
+print "modinit  - ok\n";
+
+######################### End of black magic.
+
+
+$attrs = [];
+
+$ldap_host = $ENV{"LDAPHOST"};
+$filter = $ENV{"TESTFILTER"};
+$BASEDN = $ENV{"LDAPBASE"};
+
+if (!$ldap_host)
+{
+   print "\nEnter LDAP Server: ";
+   chomp($ldap_host = <>);
+}
+
+if (!$filter)
+{
+   print "Enter Search Filter (ex. uid=abc123): ";
+   chomp($filter = <>);
+}
+
+if (!$BASEDN)
+{
+   print "Enter LDAP Search Base (ex. o=Org, c=US): ";
+   chomp($BASEDN = <>);
+}
+
+print "\n";
+
+
+##
+##  Initialize LDAP Connection
+##
+
+if (($ld = ldap_init($ldap_host,LDAP_PORT)) == -1)
+{
+   print "open     - not ok\n";
+   exit -1; 
+}
+print "open     - ok\n";
+
+##
+##  Bind as DN, PASSWORD (NULL,NULL) on LDAP connection $ld
+##
+
+if (ldap_simple_bind_s($ld,"","") != LDAP_SUCCESS)
+{
+   ldap_perror($ld,"bind_s");
+   print "bind     - not ok\n";
+   exit -1;
+}
+print "bind     - ok\n";
+
+##
+## ldap_search_s - Synchronous Search
+##
+
+if (ldap_search_s($ld,$BASEDN,LDAP_SCOPE_SUBTREE,$filter,$attrs,0,$result) != LDAP_SUCCESS)
+{
+   ldap_perror($ld,"search_s");
+   print  "search   - not ok\n";
+}
+print "search   - ok\n";
+
+##
+## ldap_count_entries - Count Matched Entries
+##
+
+if (($count = ldap_count_entries($ld,$result)) == -1)
+{
+   ldap_perror($ld,"count_entry");
+   print "count    - not ok\n";
+}
+print "count    - ok	- $count\n";
+
+##
+## first_entry - Get First Matched Entry
+## next_entry  - Get Next Matched Entry
+##
+
+   for ($ent = ldap_first_entry($ld,$result); $ent; $ent = ldap_next_entry($ld,$ent))
+   {
+      
+##
+## ldap_get_dn  -  Get DN for Matched Entries
+##
+
+      if (($dn = ldap_get_dn($ld,$ent)) ne "")
+      {
+         print "getdn    - ok	- $dn\n";
+      } else {
+         ldap_perror($ld,"get_dn");
+         print "getdn    - not ok\n";
+      }
+
+      for ($attr = ldap_first_attribute($ld,$ent,$ber); $attr; $attr = ldap_next_attribute($ld,$ent,$ber))
+      {
+         print "firstatt - ok	- $attr\n";
+
+##
+## ldap_get_values
+##
+
+         @vals = ldap_get_values($ld,$ent,$attr);
+         if ($#vals >= 0)
+         {
+            foreach $val (@vals)
+            {
+               print "getvals  - ok	- $val\n";
+            }
+         } else {
+            print "getvals  - not ok\n";
+         }
+      }
+
+
+   }
+
+##
+##  Unbind LDAP Connection
+##
+
+ldap_unbind($ld);
+

mozilla/directory/perldap/t/ChangeLog

@@ -0,0 +1,14 @@
+1999-08-06  Leif Hedstrom  <leif@netscape.com>
+
+	* conn.pl: Added support for browse() and compare().
+
+1999-03-19  Leif Hedstrom  <leif@netscape.com>
+
+	* conn.pl: Added test for add() with a hash array.
+
+1999-01-05  Leif Hedstrom  <leif@netscape.com>
+
+	* entry.pl: New script, to test all Entry:: methods.
+
+	* conn.pl: Added test for modifyRDN().
+

mozilla/directory/perldap/t/api.t

@@ -0,0 +1,4 @@
+print "This is not a real test, yet...\n";
+print "1..1\n";
+
+print "ok 1\n";

mozilla/directory/perldap/t/conn.t

@@ -0,0 +1,4 @@
+print "This is not a real test, yet...\n";
+print "1..1\n";
+
+print "ok 1\n";

mozilla/directory/perldap/t/entry.pl

@@ -0,0 +1,150 @@
+#!/usr/bin/perl5
+#############################################################################
+# $Id: entry.pl,v 1.2 1999-01-21 23:52:50 leif%netscape.com Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    Test most (all?) of the LDAP::Mozilla::Conn methods.
+#
+#############################################################################
+
+use Getopt::Std;			# To parse command line arguments.
+use Mozilla::LDAP::Conn;		# Main "OO" layer for LDAP
+use Mozilla::LDAP::Utils;		# LULU, utilities.
+use Mozilla::LDAP::API;
+
+use strict;
+no strict "vars";
+
+
+#################################################################################
+# Configurations, modify these as needed.
+#
+$BIND	= "uid=ldapadmin";
+$BASE	= "o=Netscape Communications Corp.,c=US";
+$PEOPLE	= "ou=people";
+$GROUPS	= "ou=groups";
+$UID	= "leif-test";
+$CN	= "test-group-1";
+
+
+#################################################################################
+# Constants, shouldn't have to edit these...
+#
+$APPNAM	= "entry.pl";
+$USAGE	= "$APPNAM -b base -h host -D bind -w pswd -P cert";
+
+
+#################################################################################
+# Check arguments, and configure some parameters accordingly..
+#
+if (!getopts('b:h:D:p:s:w:P:'))
+{
+   print "usage: $APPNAM $USAGE\n";
+   exit;
+}
+%ld = Mozilla::LDAP::Utils::ldapArgs($BIND, $BASE);
+
+
+#################################################################################
+# Get an LDAP connection
+#
+sub getConn
+{
+  my $conn;
+
+  if ($main::reuseConn)
+    {
+      if (!defined($main::mainConn))
+	{
+	  $main::mainConn = new Mozilla::LDAP::Conn(\%main::ld);
+	  die "Could't connect to LDAP server $main::ld{host}"
+	    unless $main::mainConn;
+	}
+      return $main::mainConn;
+    }
+  else
+    {
+      $conn = new Mozilla::LDAP::Conn(\%main::ld);
+      die "Could't connect to LDAP server $main::ld{host}" unless $conn;
+    }
+
+  return $conn;
+}
+
+
+#################################################################################
+# Some small help functions...
+#
+sub dotPrint
+{
+  my $str = shift;
+
+  print $str . '.' x (20 - length($str));
+}
+
+sub attributeEQ
+{
+  my @a, @b;
+  my $i;
+
+  @a = @{$_[0]};
+  @b = @{$_[1]};
+  return 1 if (($#a < 0) && ($#b < 0));
+  return 0 unless ($#a == $#b);
+
+  @a = sort(@a);
+  @b = sort(@b);
+  for ($i = 0; $i <= $#a; $i++)
+    {
+      return 0 unless ($a[$i] eq $b[$i]);;
+    }
+
+  return 1;             # We passed all the tests, we're ok.
+}
+
+
+#################################################################################
+# Setup the test entries.
+#
+$filter = "(uid=$UID)";
+$conn = getConn();
+$nentry = $conn->newEntry();
+
+$nentry->setDN("uid=$UID, $PEOPLE, $BASE");
+$nentry->{objectclass} = [ "top", "person", "inetOrgPerson", "mailRecipient" ];
+$nentry->addValue("uid", $UID);
+$nentry->addValue("sn", "Hedstrom");
+$nentry->addValue("givenName", "Leif");
+$nentry->addValue("cn", "Leif Hedstrom");
+$nentry->addValue("cn", "Leif P. Hedstrom");
+$nentry->addValue("cn", "The Swede");
+$nentry->addValue("description", "Test1");
+$nentry->addValue("description", "Test2");
+$nentry->addValue("description", "Test3");
+$nentry->addValue("description", "Test4");
+$nentry->addValue("description", "Test5");
+$nentry->addValue("mail", "leif\@ogre.com");
+
+$ent = $conn->search($ld{root}, $ld{scope}, $filter);
+$conn->delete($ent->getDN()) if $ent;
+$conn->add($nentry);
+
+$conn->close();

mozilla/directory/perldap/t/entry.t

@@ -0,0 +1,4 @@
+print "This is not a real test, yet...\n";
+print "1..1\n";
+
+print "ok 1\n";

mozilla/directory/perldap/t/ldif.t

@@ -0,0 +1,4 @@
+print "This is not a real test, yet...\n";
+print "1..1\n";
+
+print "ok 1\n";

mozilla/directory/perldap/t/utils.t

@@ -0,0 +1,4 @@
+print "This is not a real test, yet...\n";
+print "1..1\n";
+
+print "ok 1\n";

mozilla/directory/perldap/test_api/api.pl

@@ -0,0 +1,280 @@
+#!/usr/bin/perl -w
+#############################################################################
+# $Id: api.pl,v 1.7 1999-01-21 23:52:52 leif%netscape.com Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#   api.pl - Test all LDAPv2 API function
+#   Author:  Clayton Donley <donley@wwa.com>
+#
+#   Performs all API calls directly in order to test for possible issues
+#   on a particular platform.
+#
+#############################################################################
+
+use Mozilla::LDAP::API qw(:api :constant);
+use strict;
+
+my $BASE = "ou=Test,o=Test,c=US";
+my $DN = "cn=Directory Manager";
+my $PASS = "abcd1234";
+my $HOST = "";
+my $PORT = 389;
+
+if (!$HOST)
+{
+   print "Please edit the variables at the top of this file.\n";
+   exit -1;
+}
+
+print "\nPerLDAP API TestSuite\n";
+print "\nNote: Failures in earlier tests will cause later tests to fail.\n";
+print "\n";
+
+my $howmany = 10;
+
+# Initialize the Connection
+{
+my $ld = ldap_init($HOST,$PORT);
+if ($ld <0)
+{
+   print "init			- Failed!\n";
+   die;
+}
+print "init		- OK\n";
+
+# Set an LDAP Session Option
+if (ldap_set_option($ld,LDAP_OPT_PROTOCOL_VERSION,LDAP_VERSION3)
+      != LDAP_SUCCESS)
+{
+   print "set_option	- Failed!\n";
+} else {
+   print "set_option	- OK\n";
+}
+
+# Get an LDAP Session Option
+my $option;
+ldap_get_option($ld,LDAP_OPT_REFERRALS,$option);
+
+if ($option != 1)
+{
+   print "get_option	- Failed!\n";
+} else {
+   print "get_option	- OK\n";
+}
+
+# Anonymous Bind
+if (ldap_simple_bind_s($ld,"","") != LDAP_SUCCESS)
+{
+   print "anon_bind	- Failed!\n";
+} else {
+   print "anon_bind	- OK\n";
+}
+
+# Authenticated Simple Bind
+if (ldap_simple_bind_s($ld,$DN,$PASS) != LDAP_SUCCESS)
+{
+   print "simple_bind	- Failed!\n";
+} else {
+   print "simple_bind	- OK\n";
+}
+
+# Set Rebind Process
+my $rebindproc = sub { return($DN,$PASS,LDAP_AUTH_SIMPLE); };
+ldap_set_rebind_proc($ld,$rebindproc);
+print "set_rebind	- OK\n";
+
+# Add an OrgUnit Entry
+my $entry = {
+	"objectclass" => ["top","organizationalUnit"],
+	"ou" => "Test",
+};
+
+if (ldap_add_s($ld,$BASE,$entry) != LDAP_SUCCESS)
+{
+   print "add_org		- Failed!\n";
+} else {
+   print "add_org		- OK\n";
+}
+
+
+# Add People
+foreach my $number (1..$howmany)
+{
+   $entry = {
+	"objectclass" => ["top","person"],
+	"cn" => "Mozilla $number",
+	"sn" => ["$number"],
+   };
+   if (ldap_add_s($ld,"cn=Mozilla $number,$BASE",$entry)
+	 != LDAP_SUCCESS)
+   {
+      print "add_user_$number	- Failed!\n";
+   } else {
+      print "add_user_$number	- OK\n";
+   }
+}
+
+# Modify People
+foreach my $number (1..$howmany)
+{
+   $entry = {
+	"sn" => {"ab",["Test"]},
+        "telephoneNumber" => {"ab",[123.456]},
+#	"telephoneNumber" => "800-555-111$number",
+   };
+   if (ldap_modify_s($ld,"cn=Mozilla $number,$BASE",$entry)
+	  != LDAP_SUCCESS)
+   {
+      print "mod_user_$number	- Failed!\n";
+   } else {
+      print "mod_user_$number	- OK\n";
+   }
+}
+
+
+# Search People
+my $filter = "(sn=Test)";
+my $attrs = ["cn","sn"];
+my $res;
+if (ldap_search_s($ld,$BASE,LDAP_SCOPE_SUBTREE,$filter,$attrs,0,$res)
+     != LDAP_SUCCESS)
+{
+   print "search_user	- Failed!\n";
+} else {
+   print "search_user	- OK\n";
+}
+
+# Count Results
+if (ldap_count_entries($ld,$res) != $howmany)
+{
+   print "count_res	- Failed!\n";
+} else {
+   print "count_res	- OK\n";
+}
+
+# Sort Results
+if (ldap_sort_entries($ld,$res,"sn") != LDAP_SUCCESS)
+{
+   print "sort_ent	- Failed!\n";
+} else {
+   print "sort_ent	- OK\n";
+}
+
+# Multisort Results
+if (ldap_multisort_entries($ld,$res,["sn","telephoneNumber"]) != LDAP_SUCCESS)
+{
+   print "multisort	- Failed!\n";
+} else {
+   print "multisort	- OK\n";
+}
+
+# Get First Entry
+my $ent = ldap_first_entry($ld,$res);
+if (!$ent)
+{
+   print "first_entry	- Failed!\n";
+} else {
+   print "first_entry	- OK\n";
+}
+
+# Get Next Entry
+$ent = ldap_next_entry($ld,$ent);
+if (!$ent)
+{
+   print "next_entry	- Failed!\n";
+} else {
+   print "next_entry	- OK\n";
+}
+
+# Get DN
+my $dn = ldap_get_dn($ld,$ent);
+if (!$dn)
+{
+   print "get_dn		- Failed!\n";
+} else {
+   print "get_dn		- OK\n";
+}
+
+# Get First Attribute
+my $ber;
+my $attr = ldap_first_attribute($ld,$ent,$ber);
+if (!$attr)
+{
+   print "first_attr	- Failed!\n";
+} else {
+   print "first_attr	- OK\n";
+}
+
+# Get Next Attribute
+$attr = ldap_next_attribute($ld,$ent,$ber);
+if (!$attr)
+{
+   print "next_attr	- Failed!\n";
+} else {
+   print "next_attr	- OK\n";
+}
+
+# Get Attribute Values
+my @vals = ldap_get_values($ld,$ent,$attr);
+if ($#vals < 0)
+{
+   print "get_values	- Failed!\n";
+} else {
+   print "get_values	- OK\n";
+}
+
+# Free structures pointed to by $ber and $res to prevent memory leak
+ldap_ber_free($ber,1);
+ldap_msgfree($res);
+
+# Compare Attribute Values
+foreach my $number (1..$howmany)
+{
+   if(ldap_compare_s($ld,"cn=Mozilla $number,$BASE","sn",$number)
+	 != LDAP_COMPARE_TRUE)
+   {
+      print "comp_user_$number	- Failed!\n";
+   } else {
+      print "comp_user_$number	- OK\n";
+   }
+}
+
+# Delete Users
+foreach my $number (1..$howmany)
+{
+   if (ldap_delete_s($ld,"cn=Mozilla $number,$BASE") != LDAP_SUCCESS)
+   {
+      print "del_user_$number	- Failed!\n";
+   } else {
+      print "del_user_$number	- OK\n";
+   }
+}
+
+if (ldap_delete_s($ld,"$BASE") != LDAP_SUCCESS)
+{
+   print "del_org		- Failed!\n";
+} else {
+   print "del_org		- OK\n";
+}
+
+# Unbind
+ldap_unbind($ld);
+}

mozilla/directory/perldap/test_api/search.pl

@@ -0,0 +1,131 @@
+#!/usr/bin/perl
+#############################################################################
+# $Id: search.pl,v 1.4 1998-08-13 04:40:01 clayton Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerlDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    Test the search capabilities of the API, similar to write.pl.
+#
+#############################################################################
+
+use Mozilla::LDAP::API qw(:api :constant);
+use strict;
+
+
+my $ldap_host = "";
+my $BASEDN = "o=Org,c=US";
+my $filter = $ARGV[0];
+
+if (!$ldap_host)
+{
+   print "Edit the top portion of this file before continuing.\n";
+   exit -1;
+}
+
+my $attrs = [];
+
+my ($ld,$result,$count);
+
+##
+##  Initialize LDAP Connection
+##
+
+if (($ld = ldap_init($ldap_host,LDAP_PORT)) == -1)
+{
+   die "Can not open LDAP connection to $ldap_host";
+}
+
+##
+##  Bind as DN, PASSWORD (NULL,NULL) on LDAP connection $ld
+##
+
+if (ldap_simple_bind_s($ld,"","") != LDAP_SUCCESS)
+{
+   ldap_perror($ld,"bind_s");
+   die;
+}
+
+##
+## ldap_search_s - Synchronous Search
+##
+
+if (ldap_search_s($ld,$BASEDN,LDAP_SCOPE_SUBTREE,$filter,$attrs,0,$result) != LDAP_SUCCESS)
+{
+   ldap_perror($ld,"search_s");
+   die;
+}
+
+##
+## ldap_count_entries - Count Matched Entries
+##
+
+if (($count = ldap_count_entries($ld,$result)) == -1)
+{
+   ldap_perror($ld,"count_entry");
+   die;
+}
+
+##
+## first_entry - Get First Matched Entry
+## next_entry  - Get Next Matched Entry
+##
+
+for (my $ent = ldap_first_entry($ld,$result); $ent; $ent = ldap_next_entry($ld,$ent))
+{
+      
+##
+## ldap_get_dn  -  Get DN for Matched Entries
+##
+
+   my ($dn,$attr,@vals,$val,$ber);
+   if (($dn = ldap_get_dn($ld,$ent)) ne "")
+   {
+      print "dn: $dn\n";
+   } else {
+      ldap_perror($ld,"get_dn");
+      die;
+   }
+
+   for ($attr = ldap_first_attribute($ld,$ent,$ber); $attr; $attr = ldap_next_attribute($ld,$ent,$ber))
+   {
+
+##
+## ldap_get_values
+##
+
+      @vals = ldap_get_values($ld,$ent,$attr);
+      if ($#vals >= 0)
+      {
+         foreach $val (@vals)
+         {
+            print "$attr: $val\n";
+         }
+      }
+   }
+   ldap_ber_free($ber,0);
+}
+ldap_msgfree($result);
+
+##
+##  Unbind LDAP Connection
+##
+
+ldap_unbind($ld);
+

mozilla/directory/perldap/test_api/write.pl

@@ -0,0 +1,110 @@
+#!/usr/bin/perl -w
+#############################################################################
+# $Id: write.pl,v 1.4 1998-08-13 04:40:02 clayton Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerlDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#   write.pl - Test of LDAP Modify Operations in Perl5
+#   Author:  Clayton Donley <donley@wwa.com>
+#
+#   This utility is mostly to demonstrate all the write operations
+#   that can be done with LDAP through this PERL5 module.
+#
+#############################################################################
+
+use strict;
+use Mozilla::LDAP::API qw(:constant :api);
+
+
+# This is the entry we will be adding.  Do not use a pre-existing entry.
+my $ENTRYDN = "cn=Test Guy, o=Org, c=US";
+
+# This is the DN and password for an Administrator
+my $ROOTDN = "cn=DSManager,o=Org,c=US";
+my $ROOTPW = "";
+
+my $ldap_server = "";
+
+if (!$ldap_server)
+{
+   print "Edit the top portion of this file before continuing.\n";
+   exit -1;
+}
+
+my $ld = ldap_init($ldap_server,LDAP_PORT);
+
+if ($ld == -1)
+{
+   die "Connection to LDAP Server Failed";
+}
+
+if (ldap_simple_bind_s($ld,$ROOTDN,$ROOTPW) != LDAP_SUCCESS)
+{
+   ldap_perror($ld,"bind_s");
+   die;
+}
+
+my %testwrite = (
+	"cn" => "Test User",
+	"sn" => "User",
+        "givenName" => "Test",
+	"telephoneNumber" => "8475551212",
+	"objectClass" => ["top","person","organizationalPerson",
+           "inetOrgPerson"],
+        "mail" => "tuser\@my.org",
+);
+
+if (ldap_add_s($ld,$ENTRYDN,\%testwrite) != LDAP_SUCCESS)
+{
+   ldap_perror($ld,"add_s");
+   die;
+}
+
+print "Entry Added.\n";
+
+
+%testwrite = (
+	"telephoneNumber" => "7085551212",
+        "mail" => {"a",["Test_User\@my.org"]},
+);
+
+if (ldap_modify_s($ld,$ENTRYDN,\%testwrite) != LDAP_SUCCESS)
+{
+   ldap_perror($ld,"modify_s");
+   die;
+}
+
+print "Entry Modified.\n";
+
+#
+# Delete the entry for $ENTRYDN
+#
+if (ldap_delete_s($ld,$ENTRYDN) != LDAP_SUCCESS)
+{
+   ldap_perror($ld,"delete_s");
+   die;
+}
+
+print "Entry Deleted.\n";
+
+# Unbind to LDAP server
+ldap_unbind($ld);
+
+exit;

mozilla/directory/perldap/typemap

@@ -0,0 +1,70 @@
+#############################################################################
+# $Id: typemap,v 1.4 1998-08-13 09:15:00 leif Exp $
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is PerLDAP. The Initial Developer of the Original
+# Code is Netscape Communications Corp. and Clayton Donley. Portions
+# created by Netscape are Copyright (C) Netscape Communications
+# Corp., portions created by Clayton Donley are Copyright (C) Clayton
+# Donley. All Rights Reserved.
+#
+# Contributor(s):
+#
+# DESCRIPTION
+#    Typemap to declare XSUB data types.
+#
+#############################################################################
+
+const int		T_IV
+char *			T_PV
+const char *		T_PV
+char **			T_charptrptr
+LDAP *			T_PTR
+LDAPMessage *		T_PTR
+LDAPMessage **		T_PTR
+BerElement *		T_PTR
+LDAPControl *		T_PTR
+LDAPVersion *		T_PTR
+struct berval 		T_berval
+struct berval **	T_bervalptrptr
+FriendlyMap *		T_PTR
+LDAPsortkey **		T_PTR
+LDAPVirtualList *	T_PTR
+LDAPURLDesc *		T_PTR
+LDAPControl **		T_PTR
+LDAPFiltDesc *		T_PTR
+LDAPFiltInfo *		T_PTR
+LDAPMemCache *		T_PTR
+LDAPMemCache **		T_PTR
+struct ldap_thread_fns *	T_PTR
+LDAPMod **		T_PTR
+LDAP_CMP_CALLBACK *	T_PTR
+LDAP_REBINDPROC_CALLBACK *	T_PTR
+struct timeval		T_timeval
+
+#########
+INPUT
+T_timeval
+	$var.tv_sec = atof((char *)SvPV($arg,na));
+	$var.tv_usec = 0
+T_berval
+	$var.bv_val = (char *)SvPV($arg,na);
+	$var.bv_len = na
+T_charptrptr
+        $var = (char **)avref2charptrptr($arg)
+T_bervalptrptr
+	$var = (struct berval **)avref2berptrptr($arg)
+OUTPUT
+T_charptrptr
+	$arg = charptrptr2avref($var);
+T_bervalptrptr
+	$arg = berptrptr2avref((struct berval **)$var);

mozilla/htmlparser/src/nsAVLTree.cpp

@@ -1,617 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsAVLTree.h"
- 
-
-enum eLean      {eLeft,eNeutral,eRight};
-
-struct NS_COM nsAVLNode {
-public:
-
-  nsAVLNode(void* aValue) {
-    mLeft=0;
-    mRight=0;
-    mSkew=eNeutral;
-    mValue=aValue;
-  }
-
-  nsAVLNode*  mLeft;
-  nsAVLNode*  mRight;
-  eLean       mSkew;
-  void*       mValue;
-};
-
-
-/************************************************************
-  Now begin the tree class. Don't forget that the comparison
-  between nodes must occur via the comparitor function, 
-  otherwise all you're testing is pointer addresses.
- ************************************************************/
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-nsAVLTree::nsAVLTree(nsAVLNodeComparitor& aComparitor, 
-                     nsAVLNodeFunctor* aDeallocator) :
-  mComparitor(aComparitor), mDeallocator(aDeallocator) {
-  mRoot=0;
-  mCount=0;
-}
-
-
-static void 
-avlDeleteTree(nsAVLNode* aNode){
-  if (aNode) {
-    avlDeleteTree(aNode->mLeft);
-    avlDeleteTree(aNode->mRight);
-    delete aNode;
-  }
-}
-
-/**
- * 
- * @update	gess12/27/98
- * @param 
- * @return
- */
-nsAVLTree::~nsAVLTree(){
-  if (mDeallocator) {
-    ForEachDepthFirst(*mDeallocator);
-  }
-  avlDeleteTree(mRoot);
-}
-
-
-class CDoesntExist: public nsAVLNodeFunctor {
-public:
-  CDoesntExist(const nsAVLTree& anotherTree) : mOtherTree(anotherTree) {
-  }
-  virtual void* operator()(void* anItem) {
-    void* result=mOtherTree.FindItem(anItem);
-    if(result)
-      return nsnull;
-    return anItem;
-  }
-protected:
-  const nsAVLTree& mOtherTree;
-};
-
-/**
- * This method compares two trees (members by identity).
- * @update	gess12/27/98
- * @param   tree to compare against
- * @return  true if they are identical (contain same stuff).
- */
-PRBool nsAVLTree::operator==(const nsAVLTree& aCopy) const{
-  CDoesntExist functor(aCopy);
-  void* theItem=FirstThat(functor);
-  PRBool result=PRBool(!theItem);
-  return result;
-}
-
-
-/**
- * 
- * @update	gess12/27/98
- * @param 
- * @return
- */
-static void 
-avlRotateRight(nsAVLNode*& aRootNode){
-  nsAVLNode* ptr2;
-  nsAVLNode* ptr3;
-
-  ptr2=aRootNode->mRight;
-  if(ptr2->mSkew==eRight) {
-    aRootNode->mRight=ptr2->mLeft;
-    ptr2->mLeft=aRootNode;
-    aRootNode->mSkew=eNeutral;
-    aRootNode=ptr2;
-  }
-  else {
-    ptr3=ptr2->mLeft;
-    ptr2->mLeft=ptr3->mRight;
-    ptr3->mRight=ptr2;
-    aRootNode->mRight=ptr3->mLeft;
-    ptr3->mLeft=aRootNode;
-    if(ptr3->mSkew==eLeft)
-      ptr2->mSkew=eRight;
-    else ptr2->mSkew=eNeutral;
-    if(ptr3->mSkew==eRight)
-      aRootNode->mSkew=eLeft;
-    else aRootNode->mSkew=eNeutral;
-    aRootNode=ptr3;
-  }
-  aRootNode->mSkew=eNeutral;
-  return;
-}
-
-
-
-/**
- * 
- * @update	gess12/27/98
- * @param 
- * @return
- */
-static void 
-avlRotateLeft(nsAVLNode*& aRootNode){
-  nsAVLNode* ptr2;
-  nsAVLNode* ptr3;
-
-  ptr2=aRootNode->mLeft;
-  if(ptr2->mSkew==eLeft) {
-    aRootNode->mLeft=ptr2->mRight;
-    ptr2->mRight=aRootNode;
-    aRootNode->mSkew=eNeutral;
-    aRootNode=ptr2;
-  }
-  else {
-    ptr3=ptr2->mRight;
-    ptr2->mRight=ptr3->mLeft;
-    ptr3->mLeft=ptr2;
-    aRootNode->mLeft=ptr3->mRight;
-    ptr3->mRight=aRootNode;
-    if(ptr3->mSkew==eRight)
-      ptr2->mSkew=eLeft;
-    else ptr2->mSkew=eNeutral;
-    if(ptr3->mSkew==eLeft)
-      aRootNode->mSkew=eRight;
-    else aRootNode->mSkew=eNeutral;
-    aRootNode=ptr3;
-  }
-  aRootNode->mSkew=eNeutral;
-  return;
-}
-
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-static eAVLStatus 
-avlInsert(nsAVLNode*& aRootNode, nsAVLNode* aNewNode, 
-          nsAVLNodeComparitor& aComparitor) {
-  eAVLStatus result=eAVL_unknown;
-  
-  if(!aRootNode) {
-    aRootNode = aNewNode;
-    return eAVL_ok;
-  }
-  
-  if(aNewNode==aRootNode->mValue) {
-    return eAVL_duplicate;
-  }
-
-  PRInt32 theCompareResult=aComparitor(aRootNode->mValue,aNewNode->mValue);
-  if(0 < theCompareResult) { //if(anItem<aRootNode->mValue)
-    result=avlInsert(aRootNode->mLeft,aNewNode,aComparitor);
-    if(eAVL_ok==result) {
-      switch(aRootNode->mSkew){
-        case eLeft:
-          avlRotateLeft(aRootNode);
-          result=eAVL_fail;
-          break;
-        case eRight:
-          aRootNode->mSkew=eNeutral;
-          result=eAVL_fail;
-          break;
-        case eNeutral:
-          aRootNode->mSkew=eLeft;
-          break;
-      } //switch
-    }//if
-  } //if
-  else { 
-    result=avlInsert(aRootNode->mRight,aNewNode,aComparitor);
-    if(eAVL_ok==result) {
-      switch(aRootNode->mSkew){
-        case eLeft:
-          aRootNode->mSkew=eNeutral;
-          result=eAVL_fail;
-          break;
-        case eRight:
-          avlRotateRight(aRootNode);
-          result=eAVL_fail;
-          break;
-        case eNeutral:
-          aRootNode->mSkew=eRight;
-          break;
-      } //switch
-    }
-  } //if
-  return result;
-}
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-static void 
-avlBalanceLeft(nsAVLNode*& aRootNode, PRBool& delOk){
-  nsAVLNode*  ptr2;
-  nsAVLNode*  ptr3;
-  eLean       balnc2;
-  eLean       balnc3;
-
-  switch(aRootNode->mSkew){
-    case eLeft:
-      ptr2=aRootNode->mLeft;
-      balnc2=ptr2->mSkew;
-      if(balnc2!=eRight) {
-        aRootNode->mLeft=ptr2->mRight;
-        ptr2->mRight=aRootNode;
-        if(balnc2==eNeutral){
-          aRootNode->mSkew=eLeft;
-          ptr2->mSkew=eRight;
-          delOk=PR_FALSE;
-        }
-        else{
-          aRootNode->mSkew=eNeutral;
-          ptr2->mSkew=eNeutral;
-        }
-        aRootNode=ptr2;
-      }
-      else{
-        ptr3=ptr2->mRight;
-        balnc3=ptr3->mSkew;
-        ptr2->mRight=ptr3->mLeft;
-        ptr3->mLeft=ptr2;
-        aRootNode->mLeft=ptr3->mRight;
-        ptr3->mRight=aRootNode;
-        if(balnc3==eRight) {
-          ptr2->mSkew=eLeft;
-        }
-        else {
-          ptr2->mSkew=eNeutral;
-        }
-        if(balnc3==eLeft) {
-          aRootNode->mSkew=eRight;
-        }
-        else {
-          aRootNode->mSkew=eNeutral;
-        }
-        aRootNode=ptr3;
-        ptr3->mSkew=eNeutral;
-      }
-      break;
-
-    case eRight:
-      aRootNode->mSkew=eNeutral;
-      break;
-    
-    case eNeutral:
-      aRootNode->mSkew=eLeft;
-      delOk=PR_FALSE;
-      break;
-  }//switch
-  return;
-}
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-static void 
-avlBalanceRight(nsAVLNode*& aRootNode, PRBool& delOk){
-  nsAVLNode*  ptr2;
-  nsAVLNode*  ptr3;
-  eLean       balnc2;
-  eLean       balnc3;
-
-  switch(aRootNode->mSkew){
-    case eLeft:
-      aRootNode->mSkew=eNeutral;
-      break;
-
-    case eRight:
-      ptr2=aRootNode->mRight;
-      balnc2=ptr2->mSkew;
-      if(balnc2!=eLeft) {
-        aRootNode->mRight=ptr2->mLeft;
-        ptr2->mLeft=aRootNode;
-        if(balnc2==eNeutral){
-          aRootNode->mSkew=eRight;
-          ptr2->mSkew=eLeft;
-          delOk=PR_FALSE;
-        }
-        else{
-          aRootNode->mSkew=eNeutral;
-          ptr2->mSkew=eNeutral;
-        }
-        aRootNode=ptr2;
-      }
-      else{
-        ptr3=ptr2->mLeft;
-        balnc3=ptr3->mSkew;
-        ptr2->mLeft=ptr3->mRight;
-        ptr3->mRight=ptr2;
-        aRootNode->mRight=ptr3->mLeft;
-        ptr3->mLeft=aRootNode;
-        if(balnc3==eLeft) {
-          ptr2->mSkew=eRight;
-        }
-        else {
-          ptr2->mSkew=eNeutral;
-        }
-        if(balnc3==eRight) {
-          aRootNode->mSkew=eLeft;
-        }
-        else {
-          aRootNode->mSkew=eNeutral;
-        }
-        aRootNode=ptr3;
-        ptr3->mSkew=eNeutral;
-      }
-      break;
-
-    case eNeutral:
-      aRootNode->mSkew=eRight;
-      delOk=PR_FALSE;
-      break;
-  }//switch
-  return;
-}
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-static eAVLStatus 
-avlRemoveChildren(nsAVLNode*& aRootNode,nsAVLNode*& anotherNode, PRBool& delOk){
-  eAVLStatus result=eAVL_ok;
-  
-  if(!anotherNode->mRight){
-    aRootNode->mValue=anotherNode->mValue; //swap
-    anotherNode=anotherNode->mLeft;
-    delOk=PR_TRUE;
-  }
-  else{
-    avlRemoveChildren(aRootNode,anotherNode->mRight,delOk);
-    if(delOk)
-      avlBalanceLeft(anotherNode,delOk);
-  }
-
-  return result;
-}
-
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-static eAVLStatus 
-avlRemove(nsAVLNode*& aRootNode, void* anItem, PRBool& delOk,
-          nsAVLNodeComparitor& aComparitor){
-  eAVLStatus result=eAVL_ok;
-
-  if(!aRootNode)
-    delOk=PR_FALSE;
-  else {
-    PRInt32 cmp=aComparitor(anItem,aRootNode->mValue);
-    if(cmp<0){
-      avlRemove(aRootNode->mLeft,anItem,delOk,aComparitor);
-      if(delOk)
-        avlBalanceRight(aRootNode,delOk);
-    }
-    else if(cmp>0){
-      avlRemove(aRootNode->mRight,anItem,delOk,aComparitor);
-      if(delOk)
-        avlBalanceLeft(aRootNode,delOk);
-    }
-    else{ //they match...
-      nsAVLNode* temp=aRootNode;
-      if(!aRootNode->mRight) {
-        aRootNode=aRootNode->mLeft;
-        delOk=PR_TRUE;
-        delete temp;
-      }
-      else if(!aRootNode->mLeft) {
-        aRootNode=aRootNode->mRight;
-        delOk=PR_TRUE;
-        delete temp;
-      }
-      else {
-        avlRemoveChildren(aRootNode,aRootNode->mLeft,delOk);
-        if(delOk)
-          avlBalanceRight(aRootNode,delOk);
-      }
-    }
-  }
-
-  return result;
-}
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-eAVLStatus 
-nsAVLTree::AddItem(void* anItem){
-  eAVLStatus result=eAVL_ok;
-
-  nsAVLNode* theNewNode=new nsAVLNode(anItem);
-  result=avlInsert(mRoot,theNewNode,mComparitor);
-  if(eAVL_duplicate!=result)
-    mCount++;
-  else {
-    delete theNewNode;
-  }
-  return result;
-}
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-void* nsAVLTree::FindItem(void* aValue) const{
-  nsAVLNode* result=mRoot;
-  PRInt32 count=0;
-  while(result) {
-    count++;
-    PRInt32 cmp=mComparitor(aValue,result->mValue);
-    if(0==cmp) {
-      //we matched...
-      break;
-    }
-    else if(0>cmp){
-      //theNode was greater...
-      result=result->mLeft;
-    }
-    else {
-      //aValue is greater...
-      result=result->mRight;
-    }
-  }
-  if(result) {
-    return result->mValue;
-  }
-  return nsnull;
-}
-
-
-/**
- * 
- * @update	gess12/30/98
- * @param 
- * @return
- */
-eAVLStatus 
-nsAVLTree::RemoveItem(void* aValue){
-  PRBool delOk=PR_TRUE;
-  eAVLStatus result=avlRemove(mRoot,aValue,delOk,mComparitor);
-  if(eAVL_ok==result)
-    mCount--;
-  return result;
-} 
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-static void 
-avlForEachDepthFirst(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor){
-  if(aNode) {
-    avlForEachDepthFirst(aNode->mLeft,aFunctor);
-    avlForEachDepthFirst(aNode->mRight,aFunctor);
-    aFunctor(aNode->mValue);
-  }
-}
-
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-void 
-nsAVLTree::ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const{
-  ::avlForEachDepthFirst(mRoot,aFunctor);
-}
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-static void 
-avlForEach(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
-  if(aNode) {
-    avlForEach(aNode->mLeft,aFunctor);
-    aFunctor(aNode->mValue);
-    avlForEach(aNode->mRight,aFunctor);
-  }
-}
-
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-void 
-nsAVLTree::ForEach(nsAVLNodeFunctor& aFunctor) const{
-  ::avlForEach(mRoot,aFunctor);
-}
-
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-static void* 
-avlFirstThat(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
-  void* result=nsnull;
-  if(aNode) {
-    result = avlFirstThat(aNode->mLeft,aFunctor);
-    if (result) {
-      return result;
-    }
-    result = aFunctor(aNode->mValue);
-    if (result) {
-      return result;
-    }
-    result = avlFirstThat(aNode->mRight,aFunctor);
-  }
-  return result;
-}
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-void* 
-nsAVLTree::FirstThat(nsAVLNodeFunctor& aFunctor) const{
-  return ::avlFirstThat(mRoot,aFunctor);
-}
-

mozilla/htmlparser/src/nsAVLTree.h

@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsAVLTree_h___
-#define nsAVLTree_h___
-
-
-#include "nscore.h"
-
-
-enum eAVLStatus {eAVL_unknown,eAVL_ok,eAVL_fail,eAVL_duplicate};
-
-
-struct nsAVLNode;
-
-/**
- * 
- * @update	gess12/26/98
- * @param anObject1 is the first object to be compared
- * @param anObject2 is the second object to be compared
- * @return -1,0,1 if object1 is less, equal, greater than object2
- */
-class NS_COM nsAVLNodeComparitor {
-public:
-  virtual PRInt32 operator()(void* anItem1,void* anItem2)=0;
-}; 
-
-class NS_COM nsAVLNodeFunctor {
-public:
-  virtual void* operator()(void* anItem)=0;
-};
-
-class NS_COM nsAVLTree {
-public:
-              nsAVLTree(nsAVLNodeComparitor& aComparitor, nsAVLNodeFunctor* aDeallocator);
-              ~nsAVLTree(void);
-
-  PRBool      operator==(const nsAVLTree& aOther) const;
-  PRInt32     GetCount(void) const {return mCount;}
-
-              //main functions...
-  eAVLStatus  AddItem(void* anItem);
-  eAVLStatus  RemoveItem(void* anItem);
-  void*       FindItem(void* anItem) const;
-  void        ForEach(nsAVLNodeFunctor& aFunctor) const;
-  void        ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const;
-  void*       FirstThat(nsAVLNodeFunctor& aFunctor) const;
-
-protected: 
-
-  nsAVLNode*  mRoot;
-  PRInt32     mCount;
-  nsAVLNodeComparitor&  mComparitor;
-  nsAVLNodeFunctor*     mDeallocator;
-};
-
-
-#endif /* nsAVLTree_h___ */
-

mozilla/parser/htmlparser/src/nsAVLTree.cpp

@@ -1,617 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsAVLTree.h"
- 
-
-enum eLean      {eLeft,eNeutral,eRight};
-
-struct NS_COM nsAVLNode {
-public:
-
-  nsAVLNode(void* aValue) {
-    mLeft=0;
-    mRight=0;
-    mSkew=eNeutral;
-    mValue=aValue;
-  }
-
-  nsAVLNode*  mLeft;
-  nsAVLNode*  mRight;
-  eLean       mSkew;
-  void*       mValue;
-};
-
-
-/************************************************************
-  Now begin the tree class. Don't forget that the comparison
-  between nodes must occur via the comparitor function, 
-  otherwise all you're testing is pointer addresses.
- ************************************************************/
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-nsAVLTree::nsAVLTree(nsAVLNodeComparitor& aComparitor, 
-                     nsAVLNodeFunctor* aDeallocator) :
-  mComparitor(aComparitor), mDeallocator(aDeallocator) {
-  mRoot=0;
-  mCount=0;
-}
-
-
-static void 
-avlDeleteTree(nsAVLNode* aNode){
-  if (aNode) {
-    avlDeleteTree(aNode->mLeft);
-    avlDeleteTree(aNode->mRight);
-    delete aNode;
-  }
-}
-
-/**
- * 
- * @update	gess12/27/98
- * @param 
- * @return
- */
-nsAVLTree::~nsAVLTree(){
-  if (mDeallocator) {
-    ForEachDepthFirst(*mDeallocator);
-  }
-  avlDeleteTree(mRoot);
-}
-
-
-class CDoesntExist: public nsAVLNodeFunctor {
-public:
-  CDoesntExist(const nsAVLTree& anotherTree) : mOtherTree(anotherTree) {
-  }
-  virtual void* operator()(void* anItem) {
-    void* result=mOtherTree.FindItem(anItem);
-    if(result)
-      return nsnull;
-    return anItem;
-  }
-protected:
-  const nsAVLTree& mOtherTree;
-};
-
-/**
- * This method compares two trees (members by identity).
- * @update	gess12/27/98
- * @param   tree to compare against
- * @return  true if they are identical (contain same stuff).
- */
-PRBool nsAVLTree::operator==(const nsAVLTree& aCopy) const{
-  CDoesntExist functor(aCopy);
-  void* theItem=FirstThat(functor);
-  PRBool result=PRBool(!theItem);
-  return result;
-}
-
-
-/**
- * 
- * @update	gess12/27/98
- * @param 
- * @return
- */
-static void 
-avlRotateRight(nsAVLNode*& aRootNode){
-  nsAVLNode* ptr2;
-  nsAVLNode* ptr3;
-
-  ptr2=aRootNode->mRight;
-  if(ptr2->mSkew==eRight) {
-    aRootNode->mRight=ptr2->mLeft;
-    ptr2->mLeft=aRootNode;
-    aRootNode->mSkew=eNeutral;
-    aRootNode=ptr2;
-  }
-  else {
-    ptr3=ptr2->mLeft;
-    ptr2->mLeft=ptr3->mRight;
-    ptr3->mRight=ptr2;
-    aRootNode->mRight=ptr3->mLeft;
-    ptr3->mLeft=aRootNode;
-    if(ptr3->mSkew==eLeft)
-      ptr2->mSkew=eRight;
-    else ptr2->mSkew=eNeutral;
-    if(ptr3->mSkew==eRight)
-      aRootNode->mSkew=eLeft;
-    else aRootNode->mSkew=eNeutral;
-    aRootNode=ptr3;
-  }
-  aRootNode->mSkew=eNeutral;
-  return;
-}
-
-
-
-/**
- * 
- * @update	gess12/27/98
- * @param 
- * @return
- */
-static void 
-avlRotateLeft(nsAVLNode*& aRootNode){
-  nsAVLNode* ptr2;
-  nsAVLNode* ptr3;
-
-  ptr2=aRootNode->mLeft;
-  if(ptr2->mSkew==eLeft) {
-    aRootNode->mLeft=ptr2->mRight;
-    ptr2->mRight=aRootNode;
-    aRootNode->mSkew=eNeutral;
-    aRootNode=ptr2;
-  }
-  else {
-    ptr3=ptr2->mRight;
-    ptr2->mRight=ptr3->mLeft;
-    ptr3->mLeft=ptr2;
-    aRootNode->mLeft=ptr3->mRight;
-    ptr3->mRight=aRootNode;
-    if(ptr3->mSkew==eRight)
-      ptr2->mSkew=eLeft;
-    else ptr2->mSkew=eNeutral;
-    if(ptr3->mSkew==eLeft)
-      aRootNode->mSkew=eRight;
-    else aRootNode->mSkew=eNeutral;
-    aRootNode=ptr3;
-  }
-  aRootNode->mSkew=eNeutral;
-  return;
-}
-
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-static eAVLStatus 
-avlInsert(nsAVLNode*& aRootNode, nsAVLNode* aNewNode, 
-          nsAVLNodeComparitor& aComparitor) {
-  eAVLStatus result=eAVL_unknown;
-  
-  if(!aRootNode) {
-    aRootNode = aNewNode;
-    return eAVL_ok;
-  }
-  
-  if(aNewNode==aRootNode->mValue) {
-    return eAVL_duplicate;
-  }
-
-  PRInt32 theCompareResult=aComparitor(aRootNode->mValue,aNewNode->mValue);
-  if(0 < theCompareResult) { //if(anItem<aRootNode->mValue)
-    result=avlInsert(aRootNode->mLeft,aNewNode,aComparitor);
-    if(eAVL_ok==result) {
-      switch(aRootNode->mSkew){
-        case eLeft:
-          avlRotateLeft(aRootNode);
-          result=eAVL_fail;
-          break;
-        case eRight:
-          aRootNode->mSkew=eNeutral;
-          result=eAVL_fail;
-          break;
-        case eNeutral:
-          aRootNode->mSkew=eLeft;
-          break;
-      } //switch
-    }//if
-  } //if
-  else { 
-    result=avlInsert(aRootNode->mRight,aNewNode,aComparitor);
-    if(eAVL_ok==result) {
-      switch(aRootNode->mSkew){
-        case eLeft:
-          aRootNode->mSkew=eNeutral;
-          result=eAVL_fail;
-          break;
-        case eRight:
-          avlRotateRight(aRootNode);
-          result=eAVL_fail;
-          break;
-        case eNeutral:
-          aRootNode->mSkew=eRight;
-          break;
-      } //switch
-    }
-  } //if
-  return result;
-}
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-static void 
-avlBalanceLeft(nsAVLNode*& aRootNode, PRBool& delOk){
-  nsAVLNode*  ptr2;
-  nsAVLNode*  ptr3;
-  eLean       balnc2;
-  eLean       balnc3;
-
-  switch(aRootNode->mSkew){
-    case eLeft:
-      ptr2=aRootNode->mLeft;
-      balnc2=ptr2->mSkew;
-      if(balnc2!=eRight) {
-        aRootNode->mLeft=ptr2->mRight;
-        ptr2->mRight=aRootNode;
-        if(balnc2==eNeutral){
-          aRootNode->mSkew=eLeft;
-          ptr2->mSkew=eRight;
-          delOk=PR_FALSE;
-        }
-        else{
-          aRootNode->mSkew=eNeutral;
-          ptr2->mSkew=eNeutral;
-        }
-        aRootNode=ptr2;
-      }
-      else{
-        ptr3=ptr2->mRight;
-        balnc3=ptr3->mSkew;
-        ptr2->mRight=ptr3->mLeft;
-        ptr3->mLeft=ptr2;
-        aRootNode->mLeft=ptr3->mRight;
-        ptr3->mRight=aRootNode;
-        if(balnc3==eRight) {
-          ptr2->mSkew=eLeft;
-        }
-        else {
-          ptr2->mSkew=eNeutral;
-        }
-        if(balnc3==eLeft) {
-          aRootNode->mSkew=eRight;
-        }
-        else {
-          aRootNode->mSkew=eNeutral;
-        }
-        aRootNode=ptr3;
-        ptr3->mSkew=eNeutral;
-      }
-      break;
-
-    case eRight:
-      aRootNode->mSkew=eNeutral;
-      break;
-    
-    case eNeutral:
-      aRootNode->mSkew=eLeft;
-      delOk=PR_FALSE;
-      break;
-  }//switch
-  return;
-}
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-static void 
-avlBalanceRight(nsAVLNode*& aRootNode, PRBool& delOk){
-  nsAVLNode*  ptr2;
-  nsAVLNode*  ptr3;
-  eLean       balnc2;
-  eLean       balnc3;
-
-  switch(aRootNode->mSkew){
-    case eLeft:
-      aRootNode->mSkew=eNeutral;
-      break;
-
-    case eRight:
-      ptr2=aRootNode->mRight;
-      balnc2=ptr2->mSkew;
-      if(balnc2!=eLeft) {
-        aRootNode->mRight=ptr2->mLeft;
-        ptr2->mLeft=aRootNode;
-        if(balnc2==eNeutral){
-          aRootNode->mSkew=eRight;
-          ptr2->mSkew=eLeft;
-          delOk=PR_FALSE;
-        }
-        else{
-          aRootNode->mSkew=eNeutral;
-          ptr2->mSkew=eNeutral;
-        }
-        aRootNode=ptr2;
-      }
-      else{
-        ptr3=ptr2->mLeft;
-        balnc3=ptr3->mSkew;
-        ptr2->mLeft=ptr3->mRight;
-        ptr3->mRight=ptr2;
-        aRootNode->mRight=ptr3->mLeft;
-        ptr3->mLeft=aRootNode;
-        if(balnc3==eLeft) {
-          ptr2->mSkew=eRight;
-        }
-        else {
-          ptr2->mSkew=eNeutral;
-        }
-        if(balnc3==eRight) {
-          aRootNode->mSkew=eLeft;
-        }
-        else {
-          aRootNode->mSkew=eNeutral;
-        }
-        aRootNode=ptr3;
-        ptr3->mSkew=eNeutral;
-      }
-      break;
-
-    case eNeutral:
-      aRootNode->mSkew=eRight;
-      delOk=PR_FALSE;
-      break;
-  }//switch
-  return;
-}
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-static eAVLStatus 
-avlRemoveChildren(nsAVLNode*& aRootNode,nsAVLNode*& anotherNode, PRBool& delOk){
-  eAVLStatus result=eAVL_ok;
-  
-  if(!anotherNode->mRight){
-    aRootNode->mValue=anotherNode->mValue; //swap
-    anotherNode=anotherNode->mLeft;
-    delOk=PR_TRUE;
-  }
-  else{
-    avlRemoveChildren(aRootNode,anotherNode->mRight,delOk);
-    if(delOk)
-      avlBalanceLeft(anotherNode,delOk);
-  }
-
-  return result;
-}
-
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-static eAVLStatus 
-avlRemove(nsAVLNode*& aRootNode, void* anItem, PRBool& delOk,
-          nsAVLNodeComparitor& aComparitor){
-  eAVLStatus result=eAVL_ok;
-
-  if(!aRootNode)
-    delOk=PR_FALSE;
-  else {
-    PRInt32 cmp=aComparitor(anItem,aRootNode->mValue);
-    if(cmp<0){
-      avlRemove(aRootNode->mLeft,anItem,delOk,aComparitor);
-      if(delOk)
-        avlBalanceRight(aRootNode,delOk);
-    }
-    else if(cmp>0){
-      avlRemove(aRootNode->mRight,anItem,delOk,aComparitor);
-      if(delOk)
-        avlBalanceLeft(aRootNode,delOk);
-    }
-    else{ //they match...
-      nsAVLNode* temp=aRootNode;
-      if(!aRootNode->mRight) {
-        aRootNode=aRootNode->mLeft;
-        delOk=PR_TRUE;
-        delete temp;
-      }
-      else if(!aRootNode->mLeft) {
-        aRootNode=aRootNode->mRight;
-        delOk=PR_TRUE;
-        delete temp;
-      }
-      else {
-        avlRemoveChildren(aRootNode,aRootNode->mLeft,delOk);
-        if(delOk)
-          avlBalanceRight(aRootNode,delOk);
-      }
-    }
-  }
-
-  return result;
-}
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-eAVLStatus 
-nsAVLTree::AddItem(void* anItem){
-  eAVLStatus result=eAVL_ok;
-
-  nsAVLNode* theNewNode=new nsAVLNode(anItem);
-  result=avlInsert(mRoot,theNewNode,mComparitor);
-  if(eAVL_duplicate!=result)
-    mCount++;
-  else {
-    delete theNewNode;
-  }
-  return result;
-}
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-void* nsAVLTree::FindItem(void* aValue) const{
-  nsAVLNode* result=mRoot;
-  PRInt32 count=0;
-  while(result) {
-    count++;
-    PRInt32 cmp=mComparitor(aValue,result->mValue);
-    if(0==cmp) {
-      //we matched...
-      break;
-    }
-    else if(0>cmp){
-      //theNode was greater...
-      result=result->mLeft;
-    }
-    else {
-      //aValue is greater...
-      result=result->mRight;
-    }
-  }
-  if(result) {
-    return result->mValue;
-  }
-  return nsnull;
-}
-
-
-/**
- * 
- * @update	gess12/30/98
- * @param 
- * @return
- */
-eAVLStatus 
-nsAVLTree::RemoveItem(void* aValue){
-  PRBool delOk=PR_TRUE;
-  eAVLStatus result=avlRemove(mRoot,aValue,delOk,mComparitor);
-  if(eAVL_ok==result)
-    mCount--;
-  return result;
-} 
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-static void 
-avlForEachDepthFirst(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor){
-  if(aNode) {
-    avlForEachDepthFirst(aNode->mLeft,aFunctor);
-    avlForEachDepthFirst(aNode->mRight,aFunctor);
-    aFunctor(aNode->mValue);
-  }
-}
-
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-void 
-nsAVLTree::ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const{
-  ::avlForEachDepthFirst(mRoot,aFunctor);
-}
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-static void 
-avlForEach(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
-  if(aNode) {
-    avlForEach(aNode->mLeft,aFunctor);
-    aFunctor(aNode->mValue);
-    avlForEach(aNode->mRight,aFunctor);
-  }
-}
-
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-void 
-nsAVLTree::ForEach(nsAVLNodeFunctor& aFunctor) const{
-  ::avlForEach(mRoot,aFunctor);
-}
-
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-static void* 
-avlFirstThat(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
-  void* result=nsnull;
-  if(aNode) {
-    result = avlFirstThat(aNode->mLeft,aFunctor);
-    if (result) {
-      return result;
-    }
-    result = aFunctor(aNode->mValue);
-    if (result) {
-      return result;
-    }
-    result = avlFirstThat(aNode->mRight,aFunctor);
-  }
-  return result;
-}
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-void* 
-nsAVLTree::FirstThat(nsAVLNodeFunctor& aFunctor) const{
-  return ::avlFirstThat(mRoot,aFunctor);
-}
-

mozilla/parser/htmlparser/src/nsAVLTree.h

@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsAVLTree_h___
-#define nsAVLTree_h___
-
-
-#include "nscore.h"
-
-
-enum eAVLStatus {eAVL_unknown,eAVL_ok,eAVL_fail,eAVL_duplicate};
-
-
-struct nsAVLNode;
-
-/**
- * 
- * @update	gess12/26/98
- * @param anObject1 is the first object to be compared
- * @param anObject2 is the second object to be compared
- * @return -1,0,1 if object1 is less, equal, greater than object2
- */
-class NS_COM nsAVLNodeComparitor {
-public:
-  virtual PRInt32 operator()(void* anItem1,void* anItem2)=0;
-}; 
-
-class NS_COM nsAVLNodeFunctor {
-public:
-  virtual void* operator()(void* anItem)=0;
-};
-
-class NS_COM nsAVLTree {
-public:
-              nsAVLTree(nsAVLNodeComparitor& aComparitor, nsAVLNodeFunctor* aDeallocator);
-              ~nsAVLTree(void);
-
-  PRBool      operator==(const nsAVLTree& aOther) const;
-  PRInt32     GetCount(void) const {return mCount;}
-
-              //main functions...
-  eAVLStatus  AddItem(void* anItem);
-  eAVLStatus  RemoveItem(void* anItem);
-  void*       FindItem(void* anItem) const;
-  void        ForEach(nsAVLNodeFunctor& aFunctor) const;
-  void        ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const;
-  void*       FirstThat(nsAVLNodeFunctor& aFunctor) const;
-
-protected: 
-
-  nsAVLNode*  mRoot;
-  PRInt32     mCount;
-  nsAVLNodeComparitor&  mComparitor;
-  nsAVLNodeFunctor*     mDeallocator;
-};
-
-
-#endif /* nsAVLTree_h___ */
-

mozilla/string/obsolete/nsStr.cpp

@@ -1,717 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL. 
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-  
-/******************************************************************************************
-  MODULE NOTES:
-
-  This file contains the nsStr data structure.
-  This general purpose buffer management class is used as the basis for our strings.
-  It's benefits include:
-    1. An efficient set of library style functions for manipulating nsStrs
-    2. Support for 1 and 2 byte character strings (which can easily be increased to n)
-    3. Unicode awareness and interoperability.
-
-*******************************************************************************************/
-
-#include "nsStr.h"
-#include "bufferRoutines.h"
-#include "stdio.h"  //only used for printf
-#include "nsCRT.h"
-#include "nsDeque.h"
-
- 
-//static const char* kCallFindChar =  "For better performance, call FindChar() for targets whose length==1.";
-//static const char* kCallRFindChar = "For better performance, call RFindChar() for targets whose length==1.";
-
-static const PRUnichar gCommonEmptyBuffer[1] = {0};
-
-/**
- * This method initializes all the members of the nsStr structure 
- *
- * @update	gess10/30/98
- * @param 
- * @return
- */
-void nsStr::Initialize(nsStr& aDest,eCharSize aCharSize) {
-  aDest.mStr=(char*)gCommonEmptyBuffer;
-  aDest.mLength=0;
-  aDest.mCapacity=0;
-  aDest.mCharSize=aCharSize;
-  aDest.mOwnsBuffer=0;
-}
-
-/**
- * This method initializes all the members of the nsStr structure
- * @update	gess10/30/98
- * @param 
- * @return
- */
-void nsStr::Initialize(nsStr& aDest,char* aCString,PRUint32 aCapacity,PRUint32 aLength,eCharSize aCharSize,PRBool aOwnsBuffer){
-  aDest.mStr=(aCString) ? aCString : (char*)gCommonEmptyBuffer;
-  aDest.mLength=aLength;
-  aDest.mCapacity=aCapacity;
-  aDest.mCharSize=aCharSize;
-  aDest.mOwnsBuffer=aOwnsBuffer;
-}
-
-
-/**
- * This member destroys the memory buffer owned by an nsStr object (if it actually owns it)
- * @update	gess10/30/98
- * @param 
- * @return
- */
-void nsStr::Destroy(nsStr& aDest) {
-  if((aDest.mStr) && (aDest.mStr!=(char*)gCommonEmptyBuffer)) {
-    Free(aDest);
-  }
-}
-
-
-/**
- * This method gets called when the internal buffer needs
- * to grow to a given size. The original contents are not preserved.
- * @update  gess 3/30/98
- * @param   aNewLength -- new capacity of string in charSize units
- * @return  void
- */
-PRBool nsStr::EnsureCapacity(nsStr& aString,PRUint32 aNewLength) {
-  PRBool result=PR_TRUE;
-  if(aNewLength>aString.mCapacity) {
-    result=Realloc(aString,aNewLength);
-    if(aString.mStr)
-      AddNullTerminator(aString);
-  }
-  return result;
-}
-
-/**
- * This method gets called when the internal buffer needs
- * to grow to a given size. The original contents ARE preserved.
- * @update  gess 3/30/98
- * @param   aNewLength -- new capacity of string in charSize units
- * @return  void
- */
-PRBool nsStr::GrowCapacity(nsStr& aDest,PRUint32 aNewLength) {
-  PRBool result=PR_TRUE;
-  if(aNewLength>aDest.mCapacity) {
-    nsStr theTempStr;
-    nsStr::Initialize(theTempStr,aDest.mCharSize);
-
-    result=EnsureCapacity(theTempStr,aNewLength);
-    if(result) {
-      if(aDest.mLength) {
-        Append(theTempStr,aDest,0,aDest.mLength);        
-      } 
-      Free(aDest);
-      aDest.mStr = theTempStr.mStr;
-      theTempStr.mStr=0; //make sure to null this out so that you don't lose the buffer you just stole...
-      aDest.mLength=theTempStr.mLength;
-      aDest.mCapacity=theTempStr.mCapacity;
-      aDest.mOwnsBuffer=theTempStr.mOwnsBuffer;
-    }
-  }
-  return result;
-}
-
-/**
- * Replaces the contents of aDest with aSource, up to aCount of chars.
- * @update	gess10/30/98
- * @param   aDest is the nsStr that gets changed.
- * @param   aSource is where chars are copied from
- * @param   aCount is the number of chars copied from aSource
- */
-void nsStr::Assign(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount){
-  if(&aDest!=&aSource){
-    Truncate(aDest,0);
-    Append(aDest,aSource,anOffset,aCount);
-  }
-}
-
-/**
- * This method appends the given nsStr to this one. Note that we have to 
- * pay attention to the underlying char-size of both structs.
- * @update	gess10/30/98
- * @param   aDest is the nsStr to be manipulated
- * @param   aSource is where char are copied from
- * @aCount  is the number of bytes to be copied 
- */
-void nsStr::Append(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount){
-  if(anOffset<aSource.mLength){
-    PRUint32 theRealLen=(aCount<0) ? aSource.mLength : MinInt(aCount,aSource.mLength);
-    PRUint32 theLength=(anOffset+theRealLen<aSource.mLength) ? theRealLen : (aSource.mLength-anOffset);
-    if(0<theLength){
-      
-      PRBool isBigEnough=PR_TRUE;
-      if(aDest.mLength+theLength > aDest.mCapacity) {
-        isBigEnough=GrowCapacity(aDest,aDest.mLength+theLength);
-      }
-
-      if(isBigEnough) {
-        //now append new chars, starting at offset
-        (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDest.mLength,aSource.mStr,anOffset,theLength);
-
-        aDest.mLength+=theLength;
-        AddNullTerminator(aDest);
-      }
-    }
-  }
-}
-
-
-/**
- * This method inserts up to "aCount" chars from a source nsStr into a dest nsStr.
- * @update	gess10/30/98
- * @param   aDest is the nsStr that gets changed
- * @param   aDestOffset is where in aDest the insertion is to occur
- * @param   aSource is where chars are copied from
- * @param   aSrcOffset is where in aSource chars are copied from
- * @param   aCount is the number of chars from aSource to be inserted into aDest
- */
-void nsStr::Insert( nsStr& aDest,PRUint32 aDestOffset,const nsStr& aSource,PRUint32 aSrcOffset,PRInt32 aCount){
-  //there are a few cases for insert:
-  //  1. You're inserting chars into an empty string (assign)
-  //  2. You're inserting onto the end of a string (append)
-  //  3. You're inserting onto the 1..n-1 pos of a string (the hard case).
-  if(0<aSource.mLength){
-    if(aDest.mLength){
-      if(aDestOffset<aDest.mLength){
-        PRInt32 theRealLen=(aCount<0) ? aSource.mLength : MinInt(aCount,aSource.mLength);
-        PRInt32 theLength=(aSrcOffset+theRealLen<aSource.mLength) ? theRealLen : (aSource.mLength-aSrcOffset);
-
-        if(aSrcOffset<aSource.mLength) {
-            //here's the only new case we have to handle. 
-            //chars are really being inserted into our buffer...
-
-          if(aDest.mLength+theLength > aDest.mCapacity) {
-            nsStr theTempStr;
-            nsStr::Initialize(theTempStr,aDest.mCharSize);
-
-            PRBool isBigEnough=EnsureCapacity(theTempStr,aDest.mLength+theLength);  //grow the temp buffer to the right size
-
-            if(isBigEnough) {
-              if(aDestOffset) {
-                Append(theTempStr,aDest,0,aDestOffset); //first copy leftmost data...
-              } 
-              
-              Append(theTempStr,aSource,0,aSource.mLength); //next copy inserted (new) data
-            
-              PRUint32 theRemains=aDest.mLength-aDestOffset;
-              if(theRemains) {
-                Append(theTempStr,aDest,aDestOffset,theRemains); //next copy rightmost data
-              }
-
-              Free(aDest);
-              aDest.mStr = theTempStr.mStr;
-              theTempStr.mStr=0; //make sure to null this out so that you don't lose the buffer you just stole...
-              aDest.mCapacity=theTempStr.mCapacity;
-              aDest.mOwnsBuffer=theTempStr.mOwnsBuffer;
-            }
-
-          }
-
-          else {
-              //shift the chars right by theDelta...
-            (*gShiftChars[aDest.mCharSize][KSHIFTRIGHT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
-      
-            //now insert new chars, starting at offset
-            (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDestOffset,aSource.mStr,aSrcOffset,theLength);
-          }
-
-            //finally, make sure to update the string length...
-          aDest.mLength+=theLength;
-          AddNullTerminator(aDest);
-
-        }//if
-        //else nothing to do!
-      }
-      else Append(aDest,aSource,0,aCount);
-    }
-    else Append(aDest,aSource,0,aCount);
-  }
-}
-
-
-/**
- * This method deletes up to aCount chars from aDest
- * @update	gess10/30/98
- * @param   aDest is the nsStr to be manipulated
- * @param   aDestOffset is where in aDest deletion is to occur
- * @param   aCount is the number of chars to be deleted in aDest
- */
-void nsStr::Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount){
-  if(aDestOffset<aDest.mLength){
-
-    PRUint32 theDelta=aDest.mLength-aDestOffset;
-    PRUint32 theLength=(theDelta<aCount) ? theDelta : aCount;
-
-    if(aDestOffset+theLength<aDest.mLength) {
-
-      //if you're here, it means we're cutting chars out of the middle of the string...
-      //so shift the chars left by theLength...
-      (*gShiftChars[aDest.mCharSize][KSHIFTLEFT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
-      aDest.mLength-=theLength;
-      AddNullTerminator(aDest);
-    }
-    else Truncate(aDest,aDestOffset);
-  }//if
-}
-
-/**
- * This method truncates the given nsStr at given offset
- * @update	gess10/30/98
- * @param   aDest is the nsStr to be truncated
- * @param   aDestOffset is where in aDest truncation is to occur
- */
-void nsStr::Truncate(nsStr& aDest,PRUint32 aDestOffset){
-  if(aDestOffset<aDest.mLength){
-    aDest.mLength=aDestOffset;
-    AddNullTerminator(aDest);
-  }
-}
-
-
-/**
- * This method forces the given string to upper or lowercase
- * @update	gess1/7/99
- * @param   aDest is the string you're going to change
- * @param   aToUpper: if TRUE, then we go uppercase, otherwise we go lowercase
- * @return
- */
-void nsStr::ChangeCase(nsStr& aDest,PRBool aToUpper) {
-  // somehow UnicharUtil return failed, fallback to the old ascii only code
-  gCaseConverters[aDest.mCharSize](aDest.mStr,aDest.mLength,aToUpper);
-}
-
-/**
- * 
- * @update	gess1/7/99
- * @param 
- * @return
- */
-void nsStr::Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing){
-
-  if((aDest.mLength>0) && aSet){
-    PRInt32 theIndex=-1;
-    PRInt32 theMax=aDest.mLength;
-    PRInt32 theSetLen=nsCRT::strlen(aSet);
-
-    if(aEliminateLeading) {
-      while(++theIndex<=theMax) {
-        PRUnichar theChar=GetCharAt(aDest,theIndex);
-        PRInt32 thePos=gFindChars[eOneByte](aSet,theSetLen,0,theChar,PR_FALSE);
-        if(kNotFound==thePos)
-          break;
-      }
-      if(0<theIndex) {
-        if(theIndex<theMax) {
-          Delete(aDest,0,theIndex);
-        }
-        else Truncate(aDest,0);
-      }
-    }
-
-    if(aEliminateTrailing) {
-      theIndex=aDest.mLength;
-      PRInt32 theNewLen=theIndex;
-      while(--theIndex>0) {
-        PRUnichar theChar=GetCharAt(aDest,theIndex);  //read at end now...
-        PRInt32 thePos=gFindChars[eOneByte](aSet,theSetLen,0,theChar,PR_FALSE);
-        if(kNotFound<thePos) 
-          theNewLen=theIndex;
-        else break;
-      }
-      if(theNewLen<theMax) {
-        Truncate(aDest,theNewLen);
-      }
-    }
-
-  }
-}
-
-/**
- * 
- * @update	gess1/7/99
- * @param 
- * @return
- */
-void nsStr::CompressSet(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing){
-  Trim(aDest,aSet,aEliminateLeading,aEliminateTrailing);
-  PRUint32 aNewLen=gCompressChars[aDest.mCharSize](aDest.mStr,aDest.mLength,aSet);
-  aDest.mLength=aNewLen;
-}
-
-
-/**
- * 
- * @update	gess1/7/99
- * @param 
- * @return
- */
-void nsStr::StripChars(nsStr& aDest,const char* aSet){
-  if((0<aDest.mLength) && (aSet)) {
-    PRUint32 aNewLen=gStripChars[aDest.mCharSize](aDest.mStr,aDest.mLength,aSet);
-    aDest.mLength=aNewLen;
-  }
-}
-
-
-  /**************************************************************
-    Searching methods...
-   **************************************************************/
-
-
-/**
- *  This searches aDest for a given substring
- *  
- *  @update  gess 3/25/98
- *  @param   aDest string to search
- *  @param   aTarget is the substring you're trying to find.
- *  @param   aIgnorecase indicates case sensitivity of search
- *  @param   anOffset tells us where to start the search
- *  @return  index in aDest where member of aSet occurs, or -1 if not found
- */
-PRInt32 nsStr::FindSubstr(const nsStr& aDest,const nsStr& aTarget, PRBool aIgnoreCase,PRInt32 anOffset) {
-  // NS_PRECONDITION(aTarget.mLength!=1,kCallFindChar);
-
-  PRInt32 result=kNotFound;
-  
-  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
-    PRInt32 theMax=aDest.mLength-aTarget.mLength;
-    PRInt32 index=(0<=anOffset) ? anOffset : 0;
-    
-    if((aDest.mLength>=aTarget.mLength) && (aTarget.mLength>0) && (index>=0)){
-      PRInt32 theTargetMax=aTarget.mLength;
-      while(index<=theMax) {
-        PRInt32 theSubIndex=-1;
-        PRBool  matches=PR_TRUE;
-        while((++theSubIndex<theTargetMax) && (matches)){
-          PRUnichar theChar=(aIgnoreCase) ? nsCRT::ToLower(GetCharAt(aDest,index+theSubIndex)) : GetCharAt(aDest,index+theSubIndex);
-          PRUnichar theTargetChar=(aIgnoreCase) ? nsCRT::ToLower(GetCharAt(aTarget,theSubIndex)) : GetCharAt(aTarget,theSubIndex);
-          matches=PRBool(theChar==theTargetChar);
-        }
-        if(matches) { 
-          result=index;
-          break;
-        }
-        index++;
-      } //while
-    }//if
-  }//if
-  return result;
-}
-
-
-/**
- *  This searches aDest for a given character 
- *  
- *  @update  gess 3/25/98
- *  @param   aDest string to search
- *  @param   char is the character you're trying to find.
- *  @param   aIgnorecase indicates case sensitivity of search
- *  @param   anOffset tells us where to start the search
- *  @return  index in aDest where member of aSet occurs, or -1 if not found
- */
-PRInt32 nsStr::FindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset) {
-  PRInt32 result=kNotFound;
-  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
-    PRUint32 index=(0<=anOffset) ? (PRUint32)anOffset : 0;
-    result=gFindChars[aDest.mCharSize](aDest.mStr,aDest.mLength,index,aChar,aIgnoreCase);
-  }
-  return result;
-}
-
-
-/**
- *  This searches aDest for a character found in aSet. 
- *  
- *  @update  gess 3/25/98
- *  @param   aDest string to search
- *  @param   aSet contains a list of chars to be searched for
- *  @param   aIgnorecase indicates case sensitivity of search
- *  @param   anOffset tells us where to start the search
- *  @return  index in aDest where member of aSet occurs, or -1 if not found
- */
-PRInt32 nsStr::FindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset) {
-  //NS_PRECONDITION(aSet.mLength!=1,kCallFindChar);
-
-  PRInt32 index=(0<=anOffset) ? anOffset-1 : -1;
-  PRInt32 thePos;
-
-    //Note that the search is inverted here. We're scanning aDest, one char at a time
-    //but doing the search against the given set. That's why we use 0 as the offset below.
-  if((0<aDest.mLength) && (0<aSet.mLength)){
-    while(++index<(PRInt32)aDest.mLength) {
-      PRUnichar theChar=GetCharAt(aDest,index);
-      thePos=gFindChars[aSet.mCharSize](aSet.mStr,aSet.mLength,0,theChar,aIgnoreCase);
-      if(kNotFound!=thePos)
-        return index;
-    } //while
-  }
-  return kNotFound;
-}
-
-  /**************************************************************
-    Reverse Searching methods...
-   **************************************************************/
-
-
-/**
- *  This searches aDest (in reverse) for a given substring
- *  
- *  @update  gess 3/25/98
- *  @param   aDest string to search
- *  @param   aTarget is the substring you're trying to find.
- *  @param   aIgnorecase indicates case sensitivity of search
- *  @param   anOffset tells us where to start the search (counting from left)
- *  @return  index in aDest where member of aSet occurs, or -1 if not found
- */
-PRInt32 nsStr::RFindSubstr(const nsStr& aDest,const nsStr& aTarget, PRBool aIgnoreCase,PRInt32 anOffset) {
-  //NS_PRECONDITION(aTarget.mLength!=1,kCallRFindChar);
-
-  PRInt32 result=kNotFound;
-
-  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
-    PRInt32 index=(0<=anOffset) ? anOffset : aDest.mLength-1;
-
-    if((aDest.mLength>=aTarget.mLength) && (aTarget.mLength>0) && (index>=0)){
-
-      nsStr theCopy;
-      nsStr::Initialize(theCopy,eOneByte);
-      nsStr::Assign(theCopy,aTarget,0,aTarget.mLength);
-      if(aIgnoreCase){
-        nsStr::ChangeCase(theCopy,PR_FALSE); //force to lowercase
-      }
-    
-      PRInt32   theTargetMax=theCopy.mLength;
-      while(index>=0) {
-        PRInt32 theSubIndex=-1;
-        PRBool  matches=PR_FALSE;
-        if(index+theCopy.mLength<=aDest.mLength) {
-          matches=PR_TRUE;
-          while((++theSubIndex<theTargetMax) && (matches)){
-            PRUnichar theDestChar=(aIgnoreCase) ? nsCRT::ToLower(GetCharAt(aDest,index+theSubIndex)) : GetCharAt(aDest,index+theSubIndex);
-            PRUnichar theTargetChar=GetCharAt(theCopy,theSubIndex);
-            matches=PRBool(theDestChar==theTargetChar);
-          } //while
-        } //if
-        if(matches) {
-          result=index;
-          break;
-        }
-        index--;
-      } //while
-      nsStr::Destroy(theCopy);
-    }//if
-  }//if
-  return result;
-}
- 
-
-/**
- *  This searches aDest (in reverse) for a given character 
- *  
- *  @update  gess 3/25/98
- *  @param   aDest string to search
- *  @param   char is the character you're trying to find.
- *  @param   aIgnorecase indicates case sensitivity of search
- *  @param   anOffset tells us where to start the search
- *  @return  index in aDest where member of aSet occurs, or -1 if not found
- */
-PRInt32 nsStr::RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset) {
-  PRInt32 result=kNotFound;
-  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
-    PRUint32 index=(0<=anOffset) ? anOffset : aDest.mLength-1;
-    result=gRFindChars[aDest.mCharSize](aDest.mStr,aDest.mLength,index,aChar,aIgnoreCase);
-  }
-  return result;
-}
-
-/**
- *  This searches aDest (in reverese) for a character found in aSet. 
- *  
- *  @update  gess 3/25/98
- *  @param   aDest string to search
- *  @param   aSet contains a list of chars to be searched for
- *  @param   aIgnorecase indicates case sensitivity of search
- *  @param   anOffset tells us where to start the search
- *  @return  index in aDest where member of aSet occurs, or -1 if not found
- */
-PRInt32 nsStr::RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset) {
-  //NS_PRECONDITION(aSet.mLength!=1,kCallRFindChar);
-
-  PRInt32 index=(0<=anOffset) ? anOffset : aDest.mLength;
-  PRInt32 thePos;
-
-    //note that the search is inverted here. We're scanning aDest, one char at a time
-    //but doing the search against the given set. That's why we use 0 as the offset below.
-  if(0<aDest.mLength) {
-    while(--index>=0) {
-      PRUnichar theChar=GetCharAt(aDest,index);
-      thePos=gFindChars[aSet.mCharSize](aSet.mStr,aSet.mLength,0,theChar,aIgnoreCase);
-      if(kNotFound!=thePos)
-        return index;
-    } //while
-  }
-  return kNotFound;
-}
-
-
-/**
- * Compare source and dest strings, up to an (optional max) number of chars
- * @param   aDest is the first str to compare
- * @param   aSource is the second str to compare
- * @param   aCount -- if (-1), then we use length of longer string; if (0<aCount) then it gives the max # of chars to compare
- * @param   aIgnorecase tells us whether to search with case sensitivity
- * @return  aDest<aSource=-1;aDest==aSource==0;aDest>aSource=1
- */
-PRInt32 nsStr::Compare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
-  PRInt32 result=0;
-
-  if(aCount) {
-    PRInt32 minlen=(aSource.mLength<aDest.mLength) ? aSource.mLength : aDest.mLength;
-
-    if(0==minlen) {
-      if ((aDest.mLength == 0) && (aSource.mLength == 0))
-        return 0;
-      if (aDest.mLength == 0)
-        return -1;
-      return 1;
-    }
-
-    PRInt32 maxlen=(aSource.mLength<aDest.mLength) ? aDest.mLength : aSource.mLength;
-    aCount = (aCount<0) ? maxlen : MinInt(aCount,maxlen);
-    result=(*gCompare[aDest.mCharSize][aSource.mCharSize])(aDest.mStr,aSource.mStr,aCount,aIgnoreCase);
-  }
-  return result;
-}
-
-//----------------------------------------------------------------------------------------
-
-PRBool nsStr::Alloc(nsStr& aDest,PRUint32 aCount) {
-
-  static int mAllocCount=0;
-  mAllocCount++;
-
-  //we're given the acount value in charunits; now scale up to next multiple.
-  PRUint32	theNewCapacity=kDefaultStringSize;
-  while(theNewCapacity<aCount){ 
-		theNewCapacity<<=1;
-  }
-
-  aDest.mCapacity=theNewCapacity++;
-  PRUint32 theSize=(theNewCapacity<<aDest.mCharSize);
-  aDest.mStr = (char*)nsAllocator::Alloc(theSize);
-
-  PRBool result=PR_FALSE;
-  if(aDest.mStr) {
-    aDest.mOwnsBuffer=1;
-    result=PR_TRUE;
-  }
-  return result;
-}
-
-PRBool nsStr::Free(nsStr& aDest){
-  if(aDest.mStr){
-    if(aDest.mOwnsBuffer){
-      nsAllocator::Free(aDest.mStr);
-    }
-    aDest.mStr=0;
-    aDest.mOwnsBuffer=0;
-    return PR_TRUE;
-  }
-  return PR_FALSE;
-}
-
-PRBool nsStr::Realloc(nsStr& aDest,PRUint32 aCount){
-
-  nsStr temp;
-  memcpy(&temp,&aDest,sizeof(aDest));
-
-  PRBool result=Alloc(temp,aCount);
-  if(result) {
-    Free(aDest);
-    aDest.mStr=temp.mStr;
-    aDest.mCapacity=temp.mCapacity;
-    aDest.mOwnsBuffer=temp.mOwnsBuffer;
-  }
-  return result;
-}
-
-//----------------------------------------------------------------------------------------
-
-CBufDescriptor::CBufDescriptor(char* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
-  mBuffer=aString;
-  mCharSize=eOneByte;
-  mStackBased=aStackBased;
-  mIsConst=PR_FALSE;
-  mLength=mCapacity=0;
-  if(aString && aCapacity>1) {
-    mCapacity=aCapacity-1;
-    mLength=(-1==aLength) ? strlen(aString) : aLength;
-    if(mLength>PRInt32(mCapacity))
-      mLength=mCapacity;
-  }
-}
-
-CBufDescriptor::CBufDescriptor(const char* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
-  mBuffer=(char*)aString;
-  mCharSize=eOneByte;
-  mStackBased=aStackBased;
-  mIsConst=PR_TRUE;
-  mLength=mCapacity=0;
-  if(aString && aCapacity>1) {
-    mCapacity=aCapacity-1;
-    mLength=(-1==aLength) ? strlen(aString) : aLength;
-    if(mLength>PRInt32(mCapacity))
-      mLength=mCapacity;
-  }
-}
-
-
-CBufDescriptor::CBufDescriptor(PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
-  mBuffer=(char*)aString;
-  mCharSize=eTwoByte;
-  mStackBased=aStackBased;
-  mLength=mCapacity=0;
-  mIsConst=PR_FALSE;
-  if(aString && aCapacity>1) {
-    mCapacity=aCapacity-1;
-    mLength=(-1==aLength) ? nsCRT::strlen(aString) : aLength;
-    if(mLength>PRInt32(mCapacity))
-      mLength=mCapacity;
-  }
-}
-
-CBufDescriptor::CBufDescriptor(const PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
-  mBuffer=(char*)aString;
-  mCharSize=eTwoByte;
-  mStackBased=aStackBased;
-  mLength=mCapacity=0;
-  mIsConst=PR_TRUE;
-  if(aString && aCapacity>1) {
-    mCapacity=aCapacity-1;
-    mLength=(-1==aLength) ? nsCRT::strlen(aString) : aLength;
-    if(mLength>PRInt32(mCapacity))
-      mLength=mCapacity;
-  }
-}
-
-//----------------------------------------------------------------------------------------
-
-

mozilla/string/obsolete/nsStr.h

@@ -1,450 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-
-/***********************************************************************
-  MODULE NOTES:
-
-    1. There are two philosophies to building string classes:
-        A. Hide the underlying buffer & offer API's allow indirect iteration
-        B. Reveal underlying buffer, risk corruption, but gain performance
-        
-       We chose the option B for performance reasons. 
-
-    2  Our internal buffer always holds capacity+1 bytes.
-
-    The nsStr struct is a simple structure (no methods) that contains
-    the necessary info to be described as a string. This simple struct
-    is manipulated by the static methods provided in this class. 
-    (Which effectively makes this a library that works on structs).
-
-    There are also object-based versions called nsString and nsAutoString
-    which use nsStr but makes it look at feel like an object. 
-
- ***********************************************************************/
-
-/***********************************************************************
-  ASSUMPTIONS:
-
-    1. nsStrings and nsAutoString are always null terminated. 
-    2. If you try to set a null char (via SetChar()) a new length is set
-    3. nsCStrings can be upsampled into nsString without data loss
-    4. Char searching is faster than string searching. Use char interfaces
-       if your needs will allow it.
-    5. It's easy to use the stack for nsAutostring buffer storage (fast too!).
-       See the CBufDescriptor class in this file.
-    6. It's ONLY ok to provide non-null-terminated buffers to Append() and Insert()
-       provided you specify a 0<n value for the optional count argument.
-    7. Downsampling from nsString to nsCString is lossy -- avoid it if possible!
-    8. Calls to ToNewCString() and ToNewUnicode() should be matched with calls to Recycle().
-
- ***********************************************************************/
-
-
-/**********************************************************************************
-  
- AND NOW FOR SOME GENERAL DOCUMENTATION ON STRING USAGE...
-
-    The fundamental datatype in the string library is nsStr. It's a structure that
-    provides the buffer storage and meta-info. It also provides a C-style library
-    of functions for direct manipulation (for those of you who prefer K&R to Bjarne). 
-
-    Here's a diagram of the class hierarchy: 
-
-      nsStr
-        |___nsString
-        |      |
-        |      ------nsAutoString
-        |
-        |___nsCString
-               |
-               ------nsCAutoString
-
-    Why so many string classes? The 4 variants give you the control you need to 
-    determine the best class for your purpose. There are 2 dimensions to this 
-    flexibility: 1) stack vs. heap; and 2) 1-byte chars vs. 2-byte chars.
-
-    Note: While nsAutoString and nsCAutoString begin life using stack-based storage,
-          they may not stay that way. Like all nsString classes, autostrings will
-          automatically grow to contain the data you provide. When autostrings
-          grow beyond their intrinsic buffer, they switch to heap based allocations.
-          (We avoid alloca to avoid considerable platform difficulties; see the 
-           GNU documentation for more details).
-
-    I should also briefly mention that all the string classes use a "memory agent" 
-    object to perform memory operations. This class proxies the standard nsAllocator
-    for actual memory calls, but knows the structure of nsStr making heap operations
-    more localized.
-    
-
-  CHOOSING A STRING CLASS:
-
-    In order to choose a string class for you purpose, use this handy table:
-
-                        heap-based    stack-based
-                    -----------------------------------
-        ascii data  |   nsCString     nsCAutoString   |
-                    |----------------------------------
-      unicode data  |    nsString      nsAutoString   |
-                    ----------------------------------- 
-    
-  
-    Note: The i18n folks will stenuously object if we get too carried away with the
-          use of nsCString's that pass interface boundaries. Try to limit your
-          use of these to external interfaces that demand them, or for your own
-          private purposes in cases where they'll never be seen by humans. 
-
-    
-  PERFORMANCE CONSIDERATIONS:
-
-    Here are a few tricks to know in order to get better string performance: 
-    
-      1) Try to limit conversions between ascii and unicode; By sticking with nsString
-         wherever possible your code will be i18n-compliant.
-
-
-      2) Preallocating your string buffer cuts down trips to the allocator. So if you
-         have need for an arbitrarily large buffer, pre-size it like this:
-
-         {
-           nsString mBuffer;
-           mBuffer.SetCapacity(aReasonableSize);
-         }
-
-      3) Allocating nsAutoString or nsCAutoString on the heap is memory inefficient
-         (after all, the whole point is to avoid a heap allocation of the buffer).
-
-
-      4) Consider using an autoString to write into your arbitrarily-sized stack buffers, rather
-         than it's own buffers.
-
-         For example, let's say you're going to call printf() to emit pretty-printed debug output 
-         of your object. You know from experience that the pretty-printed version of your object 
-         exceeds the capacity of an autostring. Ignoring memory considerations, you could simply 
-         use nsCString, appending the stringized version of each of your class's data members. 
-         This will probably result in calls to the heap manager. 
-
-         But there's a way to do this without necessarily having to call the heap manager.
-         All you do is declare a stack based buffer and instruct nsCString to use that instead 
-         of it's own internal buffer by using the CBufDescriptor class:
-         
-         {
-           char theBuffer[256];
-           CBufDescritor theBufDecriptor( theBuffer, PR_TRUE, sizeof(theBuffer), 0);
-           nsCAutoString s3( theBufDescriptor );
-           s3="HELLO, my name is inigo montoya, you killed my father, prepare to die!.";
-         }
-
-         The assignment statment to s3 will cause the given string to be written to your
-         stack-based buffer via the normal nsString/nsCString interfaces. Cool, huh?  
-         Note however that just like any other nsStringXXX use, if you write more data 
-         than will fit in the buffer, a visit to the heap manager will be in order. 
-     
-
- **********************************************************************************/
-
-
-#ifndef _nsStr
-#define _nsStr
-
-#include "nscore.h"
-#include "nsIAllocator.h"
-#include <string.h>
-
-//----------------------------------------------------------------------------------------
-
-enum  eCharSize {eOneByte=0,eTwoByte=1};
-#define kDefaultCharSize eTwoByte
-#define kRadix10        (10)
-#define kRadix16        (16)
-#define kAutoDetect     (100)
-#define kRadixUnknown   (kAutoDetect+1)
-const   PRInt32 kDefaultStringSize = 64;
-const   PRInt32 kNotFound = -1;
-
-
-//----------------------------------------------------------------------------------------
-
-class NS_COM CBufDescriptor {
-public:
-  CBufDescriptor(char* aString,           PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
-  CBufDescriptor(const char* aString,     PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
-  CBufDescriptor(PRUnichar* aString,      PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
-  CBufDescriptor(const PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
-
-  char*     mBuffer;
-  eCharSize mCharSize;
-  PRUint32  mCapacity;
-  PRInt32   mLength;
-  PRBool    mStackBased;
-  PRBool    mIsConst;
-};
-
-//----------------------------------------------------------------------------------------
-
-
-struct NS_COM nsStr {  
-
-//----------------------------------------------------------------------------------------
-
-  nsStr() {
-    MOZ_COUNT_CTOR(nsStr);
-  }
-
-  ~nsStr() {
-    MOZ_COUNT_DTOR(nsStr);
-  }
-
- /**
-  * This method initializes an nsStr for use
-  *
-  * @update	gess 01/04/99
-  * @param  aString is the nsStr to be initialized
-  * @param  aCharSize tells us the requested char size (1 or 2 bytes)
-  */
-  static void Initialize(nsStr& aDest,eCharSize aCharSize);
-
- /**
-  * This method initializes an nsStr for use
-  *
-  * @update	gess 01/04/99
-  * @param  aString is the nsStr to be initialized
-  * @param  aCharSize tells us the requested char size (1 or 2 bytes)
-  */
-  static void Initialize(nsStr& aDest,char* aCString,PRUint32 aCapacity,PRUint32 aLength,eCharSize aCharSize,PRBool aOwnsBuffer);
-
- /**
-  * This method destroys the given nsStr, and *MAY* 
-  * deallocate it's memory depending on the setting
-  * of the internal mOwnsBUffer flag.
-  *
-  * @update	gess 01/04/99
-  * @param  aString is the nsStr to be manipulated
-  * @param  anAgent is the allocator to be used to the nsStr
-  */
-  static void Destroy(nsStr& aDest); 
-
- /**
-  * These methods are where memory allocation/reallocation occur. 
-  *
-  * @update	gess 01/04/99
-  * @param  aString is the nsStr to be manipulated
-  * @param  anAgent is the allocator to be used on the nsStr
-  * @return  
-  */
-  static PRBool EnsureCapacity(nsStr& aString,PRUint32 aNewLength);
-  static PRBool GrowCapacity(nsStr& aString,PRUint32 aNewLength);
-
- /**
-  * These methods are used to append content to the given nsStr
-  *
-  * @update	gess 01/04/99
-  * @param  aDest is the nsStr to be appended to
-  * @param  aSource is the buffer to be copied from
-  * @param  anOffset tells us where in source to start copying
-  * @param  aCount tells us the (max) # of chars to copy
-  * @param  anAgent is the allocator to be used for alloc/free operations
-  */
-  static void Append(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount);
-
- /**
-  * These methods are used to assign contents of a source string to dest string
-  *
-  * @update	gess 01/04/99
-  * @param  aDest is the nsStr to be appended to
-  * @param  aSource is the buffer to be copied from
-  * @param  anOffset tells us where in source to start copying
-  * @param  aCount tells us the (max) # of chars to copy
-  * @param  anAgent is the allocator to be used for alloc/free operations
-  */
-  static void Assign(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount);
-
- /**
-  * These methods are used to insert content from source string to the dest nsStr
-  *
-  * @update	gess 01/04/99
-  * @param  aDest is the nsStr to be appended to
-  * @param  aDestOffset tells us where in dest to start insertion
-  * @param  aSource is the buffer to be copied from
-  * @param  aSrcOffset tells us where in source to start copying
-  * @param  aCount tells us the (max) # of chars to insert
-  * @param  anAgent is the allocator to be used for alloc/free operations
-  */
-  static void Insert( nsStr& aDest,PRUint32 aDestOffset,const nsStr& aSource,PRUint32 aSrcOffset,PRInt32 aCount);
-
- /**
-  * This method deletes chars from the given str. 
-  * The given allocator may choose to resize the str as well.
-  *
-  * @update	gess 01/04/99
-  * @param  aDest is the nsStr to be deleted from
-  * @param  aDestOffset tells us where in dest to start deleting
-  * @param  aCount tells us the (max) # of chars to delete
-  * @param  anAgent is the allocator to be used for alloc/free operations
-  */
-  static void Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount);
-
- /**
-  * This method is used to truncate the given string.
-  * The given allocator may choose to resize the str as well (but it's not likely).
-  *
-  * @update	gess 01/04/99
-  * @param  aDest is the nsStr to be appended to
-  * @param  aDestOffset tells us where in dest to start insertion
-  * @param  aSource is the buffer to be copied from
-  * @param  aSrcOffset tells us where in source to start copying
-  * @param  anAgent is the allocator to be used for alloc/free operations
-  */
-  static void Truncate(nsStr& aDest,PRUint32 aDestOffset);
-
- /**
-  * This method is used to perform a case conversion on the given string
-  *
-  * @update	gess 01/04/99
-  * @param  aDest is the nsStr to be case shifted
-  * @param  toUpper tells us to go upper vs. lower
-  */
-  static void ChangeCase(nsStr& aDest,PRBool aToUpper);
-
-
-  /**
-   * This method trims chars (given in aSet) from the edges of given buffer 
-   *
-   * @update	gess 01/04/99
-   * @param   aDest is the buffer to be manipulated
-   * @param   aSet tells us which chars to remove from given buffer
-   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
-   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
-   */
-  static void Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
-  
-  /**
-   * This method compresses duplicate runs of a given char from the given buffer 
-   *
-   * @update	gess 01/04/99
-   * @param   aDest is the buffer to be manipulated
-   * @param   aSet tells us which chars to compress from given buffer
-   * @param   aChar is the replacement char
-   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
-   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
-   */
-  static void CompressSet(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
-
-  /**
-   * This method removes all occurances of chars in given set from aDest 
-   *
-   * @update	gess 01/04/99
-   * @param   aDest is the buffer to be manipulated
-   * @param   aSet tells us which chars to compress from given buffer
-   * @param   aChar is the replacement char
-   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
-   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
-   */
-  static void StripChars(nsStr& aDest,const char* aSet);
-
-  /**
-   * This method compares the data bewteen two nsStr's 
-   *
-   * @update	gess 01/04/99
-   * @param   aStr1 is the first buffer to be compared
-   * @param   aStr2 is the 2nd buffer to be compared
-   * @param   aCount is the number of chars to compare
-   * @param   aIgnorecase tells us whether to use a case-sensitive comparison
-   * @return  -1,0,1 depending on <,==,>
-   */
-  static PRInt32  Compare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase);
-
- /**
-  * These methods scan the given string for 1 or more chars in a given direction
-  *
-  * @update	gess 01/04/99
-  * @param  aDest is the nsStr to be searched to
-  * @param  aSource (or aChar) is the substr we're looking to find
-  * @param  aIgnoreCase tells us whether to search in a case-sensitive manner
-  * @param  anOffset tells us where in the dest string to start searching
-  * @return the index of the source (substr) in dest, or -1 (kNotFound) if not found.
-  */
-  static PRInt32 FindSubstr(const nsStr& aDest,const nsStr& aSource, PRBool aIgnoreCase,PRInt32 anOffset);
-  static PRInt32 FindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset);
-  static PRInt32 FindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
-
-  static PRInt32 RFindSubstr(const nsStr& aDest,const nsStr& aSource, PRBool aIgnoreCase,PRInt32 anOffset);
-  static PRInt32 RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset);
-  static PRInt32 RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
-
-
-  PRUint32        mLength;
-  PRUint32        mCapacity;
-  eCharSize       mCharSize;
-  PRBool          mOwnsBuffer;
-
-  union { 
-    char*         mStr;
-    PRUnichar*    mUStr;
-  };
-
-private:
-  static PRBool Alloc(nsStr& aString,PRUint32 aCount);
-  static PRBool Realloc(nsStr& aString,PRUint32 aCount);
-  static PRBool Free(nsStr& aString);
-
-};
-
-/**************************************************************
-  A couple of tiny helper methods used in the string classes.
- **************************************************************/
-
-inline PRInt32 MinInt(PRInt32 anInt1,PRInt32 anInt2){
-  return (anInt1<anInt2) ? anInt1 : anInt2;
-}
-
-inline PRInt32 MaxInt(PRInt32 anInt1,PRInt32 anInt2){
-  return (anInt1<anInt2) ? anInt2 : anInt1;
-}
-
-inline void AddNullTerminator(nsStr& aDest) {
-  if(eTwoByte==aDest.mCharSize) 
-    aDest.mUStr[aDest.mLength]=0;
-  else aDest.mStr[aDest.mLength]=0;
-}
-
-/**
- * Return the given buffer to the heap manager. Calls allocator::Free()
- * @return string length
- */
-inline void Recycle( char* aBuffer) { nsAllocator::Free(aBuffer); }
-inline void Recycle( PRUnichar* aBuffer) { nsAllocator::Free(aBuffer); }
-
-/**
-* This method is used to access a given char in the given string
-*
-* @update	gess 01/04/99
-* @param  aDest is the nsStr to be appended to
-* @param  anIndex tells us where in dest to get the char from
-* @return the given char, or 0 if anIndex is out of range
-*/
-inline PRUnichar GetCharAt(const nsStr& aDest,PRUint32 anIndex){
-  if(anIndex<aDest.mLength)  {
-    return (eTwoByte==aDest.mCharSize) ? aDest.mUStr[anIndex] : aDest.mStr[anIndex];
-  }//if
-  return 0;
-}
-
-
-#endif
-

mozilla/string/obsolete/nsString.h

@@ -1,747 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-
-/***********************************************************************
-  MODULE NOTES:
-
-  See nsStr.h for a more general description of string classes.
-
-  This version of the nsString class offers many improvements over the
-  original version:
-    1. Wide and narrow chars
-    2. Allocators
-    3. Much smarter autostrings
-    4. Subsumable strings
- ***********************************************************************/
-
-
-#ifndef _nsCString_
-#define _nsCString_
-
-#include "nsString2.h"
-#include "prtypes.h"
-#include "nscore.h"
-#include <stdio.h>
-#include "nsStr.h"
-#include "nsIAtom.h"
-
-
-class NS_COM nsSubsumeCStr;
-
-class NS_COM nsCString : public nsStr {
-
-public: 
-
-  /**
-   * Default constructor. 
-   */
-  nsCString();
-
-  /**
-   * This constructor accepts an isolatin string
-   * @param   aCString is a ptr to a 1-byte cstr
-   */
-  nsCString(const char* aCString,PRInt32 aLength=-1);
-
-  /**
-   * This constructor accepts a unichar string
-   * @param   aCString is a ptr to a 2-byte cstr
-   */
-  nsCString(const PRUnichar* aString,PRInt32 aLength=-1);
-
-  /**
-   * This is a copy constructor that accepts an nsStr
-   * @param   reference to another nsCString
-   */
-  nsCString(const nsStr&);
-
-  /**
-   * This is our copy constructor 
-   * @param   reference to another nsCString
-   */
-  nsCString(const nsCString& aString);   
-
-  /**
-   * This constructor takes a subsumestr
-   * @param   reference to subsumestr
-   */
-  nsCString(nsSubsumeCStr& aSubsumeStr);   
-
-  /**
-   * Destructor
-   * 
-   */
-  virtual ~nsCString();    
-
-  /**
-   * Retrieve the length of this string
-   * @return string length
-   */
-  inline PRInt32 Length() const { return (PRInt32)mLength; }
-
-  /**
-   * Retrieve the size of this string
-   * @return string length
-   */
-  virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
-
-
-  /**
-   * Call this method if you want to force a different string capacity
-   * @update  gess7/30/98
-   * @param   aLength -- contains new length for mStr
-   * @return
-   */
-  void SetLength(PRUint32 aLength) { 
-    Truncate(aLength);
-  }
-
-  /**
-   * Sets the new length of the string.
-   * @param   aLength is new string length.
-   * @return  nada
-   */
-  void SetCapacity(PRUint32 aLength);
-  /**
-   * This method truncates this string to given length.
-   *
-   * @param   anIndex -- new length of string
-   * @return  nada
-   */
-  void Truncate(PRInt32 anIndex=0);
-
-
-  /**
-   *  Determine whether or not the characters in this
-   *  string are in sorted order.
-   *  
-   *  @return  TRUE if ordered.
-   */
-  PRBool IsOrdered(void) const;
-
-
-  /**
-   *  Determine whether or not this string has a length of 0
-   *  
-   *  @return  TRUE if empty.
-   */
-  PRBool IsEmpty(void) const {
-    return PRBool(0==mLength);
-  }
-
-  /**********************************************************************
-    Accessor methods...
-   *********************************************************************/
-
-
-   /**
-     * Retrieve const ptr to internal buffer; DO NOT TRY TO FREE IT!
-     */
-  const char* GetBuffer(void) const;
-
-
-   /**
-     * Get nth character.
-     */
-  PRUnichar operator[](PRUint32 anIndex) const;
-  PRUnichar CharAt(PRUint32 anIndex) const;
-  PRUnichar First(void) const;
-  PRUnichar Last(void) const;
-
-  PRBool SetCharAt(PRUnichar aChar,PRUint32 anIndex);
-
-
-  /**********************************************************************
-    String creation methods...
-   *********************************************************************/
-
-  /**
-   * Create a new string by appending given string to this
-   * @param   aString -- 2nd string to be appended
-   * @return  new string
-   */
-  nsSubsumeCStr operator+(const nsCString& aString);
-
-  /**
-   * create a new string by adding this to the given char*.
-   * @param   aCString is a ptr to cstring to be added to this
-   * @return  newly created string
-   */
-  nsSubsumeCStr operator+(const char* aCString);
-
-
-  /**
-   * create a new string by adding this to the given char.
-   * @param   aChar is a char to be added to this
-   * @return  newly created string
-   */
-  nsSubsumeCStr operator+(PRUnichar aChar);
-  nsSubsumeCStr operator+(char aChar);
-
-
-  /**********************************************************************
-    Lexomorphic transforms...
-   *********************************************************************/
-
-  /**
-   * Converts chars in this to lowercase
-   * @update  gess 7/27/98
-   */
-  void ToLowerCase();
-
-
-  /**
-   * Converts chars in this to lowercase, and
-   * stores them in aOut
-   * @update  gess 7/27/98
-   * @param   aOut is a string to contain result
-   */
-  void ToLowerCase(nsCString& aString) const;
-
-  /**
-   * Converts chars in this to uppercase
-   * @update  gess 7/27/98
-   */
-  void ToUpperCase();
-
-  /**
-   * Converts chars in this to lowercase, and
-   * stores them in a given output string
-   * @update  gess 7/27/98
-   * @param   aOut is a string to contain result
-   */
-  void ToUpperCase(nsCString& aString) const;
-
-
-  /**
-   *  This method is used to remove all occurances of the
-   *  characters found in aSet from this string.
-   *  
-   *  @param  aSet -- characters to be cut from this
-   *  @return *this 
-   */
-  nsCString& StripChars(const char* aSet);
-  nsCString& StripChar(char aChar);
-
-  /**
-   *  This method strips whitespace throughout the string
-   *  
-   *  @return  this
-   */
-  nsCString& StripWhitespace();
-
-  /**
-   *  swaps occurence of 1 string for another
-   *  
-   *  @return  this
-   */
-  nsCString& ReplaceChar(PRUnichar aOldChar,PRUnichar aNewChar);
-  nsCString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
-
-  PRInt32 CountChar(PRUnichar aChar);
-
-  /**
-   *  This method trims characters found in aTrimSet from
-   *  either end of the underlying string.
-   *  
-   *  @param   aTrimSet -- contains chars to be trimmed from
-   *           both ends
-   *  @return  this
-   */
-  nsCString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
-
-  /**
-   *  This method strips whitespace from string.
-   *  You can control whether whitespace is yanked from
-   *  start and end of string as well.
-   *  
-   *  @param   aEliminateLeading controls stripping of leading ws
-   *  @param   aEliminateTrailing controls stripping of trailing ws
-   *  @return  this
-   */
-  nsCString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
-
-  /**
-   *  This method strips whitespace from string.
-   *  You can control whether whitespace is yanked from
-   *  start and end of string as well.
-   *  
-   *  @param   aEliminateLeading controls stripping of leading ws
-   *  @param   aEliminateTrailing controls stripping of trailing ws
-   *  @return  this
-   */
-  nsCString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
-
-  /**********************************************************************
-    string conversion methods...
-   *********************************************************************/
-
-      operator char*() {return mStr;}
-      operator const char*() const {return (const char*)mStr;}
-
-  /**
-   * This method constructs a new nsCString that is a clone
-   * of this string.
-   * 
-   */
-  nsCString* ToNewString() const;
-
-  /**
-   * Creates an ISOLatin1 clone of this string
-   * Note that calls to this method should be matched with calls to Recycle().
-   * @return  ptr to new isolatin1 string
-   */
-  char* ToNewCString() const;
-
-  /**
-   * Creates a unicode clone of this string
-   * Note that calls to this method should be matched with calls to Recycle().
-   * @return  ptr to new unicode string
-   */
-  PRUnichar* ToNewUnicode() const;
-
-  /**
-   * Copies data from internal buffer onto given char* buffer
-   * NOTE: This only copies as many chars as will fit in given buffer (clips)
-   * @param aBuf is the buffer where data is stored
-   * @param aBuflength is the max # of chars to move to buffer
-   * @return ptr to given buffer
-   */
-  char* ToCString(char* aBuf,PRUint32 aBufLength,PRUint32 anOffset=0) const;
-
-  /**
-   * Perform string to float conversion.
-   * @param   aErrorCode will contain error if one occurs
-   * @return  float rep of string value
-   */
-  float ToFloat(PRInt32* aErrorCode) const;
-
-  /**
-   * Try to derive the radix from the value contained in this string
-   * @return  kRadix10, kRadix16 or kAutoDetect (meaning unknown)
-   */
-  PRUint32  DetermineRadix(void);
-
-  /**
-   * Perform string to int conversion.
-   * @param   aErrorCode will contain error if one occurs
-   * @return  int rep of string value
-   */
-  PRInt32   ToInteger(PRInt32* aErrorCode,PRUint32 aRadix=kRadix10) const;
-
-
-  /**********************************************************************
-    String manipulation methods...                
-   *********************************************************************/
-
-  /**
-   * Functionally equivalent to assign or operator=
-   * 
-   */
-  nsCString& SetString(const char* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
-  nsCString& SetString(const nsStr& aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
-
-  /**
-   * assign given string to this string
-   * @param   aStr: buffer to be assigned to this 
-   * @param   alength is the length of the given str (or -1)
-              if you want me to determine its length
-   * @return  this
-   */
-  nsCString& Assign(const nsStr& aString,PRInt32 aCount=-1);
-  nsCString& Assign(const char* aString,PRInt32 aCount=-1);
-  nsCString& Assign(const PRUnichar* aString,PRInt32 aCount=-1);
-  nsCString& Assign(PRUnichar aChar);
-  nsCString& Assign(char aChar);
-
-  /**
-   * here come a bunch of assignment operators...
-   * @param   aString: string to be added to this
-   * @return  this
-   */
-  nsCString& operator=(const nsCString& aString) {return Assign(aString);}
-  nsCString& operator=(const nsStr& aString) {return Assign(aString);}
-  nsCString& operator=(PRUnichar aChar) {return Assign(aChar);}
-  nsCString& operator=(char aChar) {return Assign(aChar);}
-  nsCString& operator=(const char* aCString) {return Assign(aCString);}
-  nsCString& operator=(const PRUnichar* aString) {return Assign(aString);}
-  #ifdef AIX
-  nsCString& operator=(const nsSubsumeCStr& aSubsumeString);  // AIX requires a const here
-  #else
-  nsCString& operator=(nsSubsumeCStr& aSubsumeString);
-  #endif
-
-  /**
-   * Here's a bunch of methods that append varying types...
-   * @param   various...
-   * @return  this
-   */
-  nsCString& operator+=(const nsCString& aString){return Append(aString,aString.mLength);}
-  nsCString& operator+=(const char* aCString) {return Append(aCString);}
-  nsCString& operator+=(PRUnichar aChar){return Append(aChar);}
-  nsCString& operator+=(char aChar){return Append(aChar);}
-
-  /*
-   *  Appends n characters from given string to this,
-   *  This version computes the length of your given string
-   *  
-   *  @param   aString is the source to be appended to this
-   *  @return  number of chars copied
-   */
-  nsCString& Append(const nsCString& aString) {return Append(aString,aString.mLength);}
- 
-
-  /*
-   *  Appends n characters from given string to this,
-   *  
-   *  @param   aString is the source to be appended to this
-   *  @param   aCount -- number of chars to copy; -1 tells us to compute the strlen for you
-   *  @return  number of chars copied
-   */
-  nsCString& Append(const nsCString& aString,PRInt32 aCount);
-  nsCString& Append(const nsStr& aString,PRInt32 aCount=-1);
-  nsCString& Append(const char* aString,PRInt32 aCount=-1);
-  nsCString& Append(PRUnichar aChar);
-  nsCString& Append(char aChar);
-  nsCString& Append(PRInt32 aInteger,PRInt32 aRadix=10); //radix=8,10 or 16
-  nsCString& Append(float aFloat);
-             
-  /*
-   *  Copies n characters from this string to given string,
-   *  starting at the leftmost offset.
-   *  
-   *  
-   *  @param   aCopy -- Receiving string
-   *  @param   aCount -- number of chars to copy
-   *  @return  number of chars copied
-   */
-  PRUint32 Left(nsCString& aCopy,PRInt32 aCount) const;
-
-  /*
-   *  Copies n characters from this string to given string,
-   *  starting at the given offset.
-   *  
-   *  
-   *  @param   aCopy -- Receiving string
-   *  @param   aCount -- number of chars to copy
-   *  @param   anOffset -- position where copying begins
-   *  @return  number of chars copied
-   */
-  PRUint32 Mid(nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount) const;
-
-  /*
-   *  Copies n characters from this string to given string,
-   *  starting at rightmost char.
-   *  
-   *  
-   *  @param  aCopy -- Receiving string
-   *  @param  aCount -- number of chars to copy
-   *  @return number of chars copied
-   */
-  PRUint32 Right(nsCString& aCopy,PRInt32 aCount) const;
-
-  /*
-   *  This method inserts n chars from given string into this
-   *  string at str[anOffset].
-   *  
-   *  @param  aCopy -- String to be inserted into this
-   *  @param  anOffset -- insertion position within this str
-   *  @param  aCount -- number of chars to be copied from aCopy
-   *  @return number of chars inserted into this.
-   */
-  nsCString& Insert(const nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
-
-  /**
-   * Insert a given string into this string at
-   * a specified offset.
-   *
-   * @param   aString* to be inserted into this string
-   * @param   anOffset is insert pos in str 
-   * @return  the number of chars inserted into this string
-   */
-  nsCString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
-
-  /**
-   * Insert a single char into this string at
-   * a specified offset.
-   *
-   * @param   character to be inserted into this string
-   * @param   anOffset is insert pos in str 
-   * @return  the number of chars inserted into this string
-   */
-  nsCString& Insert(PRUnichar aChar,PRUint32 anOffset);
-  nsCString& Insert(char aChar,PRUint32 anOffset);
-
-  /*
-   *  This method is used to cut characters in this string
-   *  starting at anOffset, continuing for aCount chars.
-   *  
-   *  @param  anOffset -- start pos for cut operation
-   *  @param  aCount -- number of chars to be cut
-   *  @return *this
-   */
-  nsCString& Cut(PRUint32 anOffset,PRInt32 aCount);
-
-
-  /**********************************************************************
-    Searching methods...                
-   *********************************************************************/
- 
-  /**
-   *  Search for given character within this string.
-   *  This method does so by using a binary search,
-   *  so your string HAD BETTER BE ORDERED!
-   *  
-   *  @param   aChar is the unicode char to be found
-   *  @return  offset in string, or -1 (kNotFound)
-   */
-  PRInt32 BinarySearch(PRUnichar aChar) const;
-
-  /**
-   *  Search for given substring within this string
-   *  
-   *  @param   aString is substring to be sought in this
-   *  @param   aIgnoreCase selects case sensitivity
-   *  @param   anOffset tells us where in this strig to start searching
-   *  @return  offset in string, or -1 (kNotFound)
-   */
-  PRInt32 Find(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-  PRInt32 Find(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-  PRInt32 Find(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-
-  /**
-   *  Search for given char within this string
-   *  
-   *  @param   aString is substring to be sought in this
-   *  @param   anOffset tells us where in this strig to start searching
-   *  @param   aIgnoreCase selects case sensitivity
-   *  @return  find pos in string, or -1 (kNotFound)
-   */
-  PRInt32 FindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-
-  /**
-   * This method searches this string for the first character
-   * found in the given charset
-   * @param aString contains set of chars to be found
-   * @param anOffset tells us where to start searching in this
-   * @return -1 if not found, else the offset in this
-   */
-  PRInt32 FindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
-  PRInt32 FindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
-  PRInt32 FindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
-
-
-  /**
-   * This methods scans the string backwards, looking for the given string
-   * @param   aString is substring to be sought in this
-   * @param   aIgnoreCase tells us whether or not to do caseless compare
-   * @return  offset in string, or -1 (kNotFound)
-   */
-  PRInt32 RFind(const char* aCString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-  PRInt32 RFind(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-  PRInt32 RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-
-
-  /**
-   *  Search for given char within this string
-   *  
-   *  @param   aString is substring to be sought in this
-   *  @param   anOffset tells us where in this strig to start searching
-   *  @param   aIgnoreCase selects case sensitivity
-   *  @return  find pos in string, or -1 (kNotFound)
-   */
-  PRInt32 RFindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-
-  /**
-   * This method searches this string for the last character
-   * found in the given string
-   * @param aString contains set of chars to be found
-   * @param anOffset tells us where to start searching in this
-   * @return -1 if not found, else the offset in this
-   */
-  PRInt32 RFindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
-  PRInt32 RFindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
-  PRInt32 RFindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
-
-
-
-  /**********************************************************************
-    Comparison methods...                
-   *********************************************************************/
-
-  /**
-   * Compares a given string type to this string. 
-   * @update  gess 7/27/98
-   * @param   S is the string to be compared
-   * @param   aIgnoreCase tells us how to treat case
-   * @param   aCount tells us how many chars to compare
-   * @return  -1,0,1
-   */
-  virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-
-  /**
-   * These methods compare a given string type to this one
-   * @param aString is the string to be compared to this
-   * @return  TRUE or FALSE
-   */
-  PRBool  operator==(const nsStr &aString) const;
-  PRBool  operator==(const char* aString) const;
-  PRBool  operator==(const PRUnichar* aString) const;
-
-  /**
-   * These methods perform a !compare of a given string type to this 
-   * @param aString is the string to be compared to this
-   * @return  TRUE 
-   */
-  PRBool  operator!=(const nsStr &aString) const;
-  PRBool  operator!=(const char* aString) const;
-  PRBool  operator!=(const PRUnichar* aString) const;
-
-  /**
-   * These methods test if a given string is < than this
-   * @param aString is the string to be compared to this
-   * @return  TRUE or FALSE
-   */
-  PRBool  operator<(const nsStr &aString) const;
-  PRBool  operator<(const char* aString) const;
-  PRBool  operator<(const PRUnichar* aString) const;
-
-  /**
-   * These methods test if a given string is > than this
-   * @param aString is the string to be compared to this
-   * @return  TRUE or FALSE
-   */
-  PRBool  operator>(const nsStr &S) const;
-  PRBool  operator>(const char* aString) const;
-  PRBool  operator>(const PRUnichar* aString) const;
-
-  /**
-   * These methods test if a given string is <= than this
-   * @param aString is the string to be compared to this
-   * @return  TRUE or FALSE
-   */
-  PRBool  operator<=(const nsStr &S) const;
-  PRBool  operator<=(const char* aString) const;
-  PRBool  operator<=(const PRUnichar* aString) const;
-
-  /**
-   * These methods test if a given string is >= than this
-   * @param aString is the string to be compared to this
-   * @return  TRUE or FALSE
-   */
-  PRBool  operator>=(const nsStr &S) const;
-  PRBool  operator>=(const char* aString) const;
-  PRBool  operator>=(const PRUnichar* aString) const;
-
-  /**
-   * Compare this to given string; note that we compare full strings here.
-   * The optional length argument just lets us know how long the given string is.
-   * If you provide a length, it is compared to length of this string as an
-   * optimization.
-   * 
-   * @param  aString -- the string to compare to this
-   * @param  aCount  -- number of chars in given string you want to compare
-   * @return TRUE if equal
-   */
-  PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-
-  PRBool  EqualsIgnoreCase(const nsStr& aString) const;
-  PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aCount=-1) const;
-  PRBool  EqualsIgnoreCase(const PRUnichar* aString,PRInt32 aCount=-1) const;
-
-
-  static  void        Recycle(nsCString* aString);
-  static  nsCString*  CreateString(void);
-
-};
-
-extern NS_COM int fputs(const nsCString& aString, FILE* out);
-//ostream& operator<<(ostream& aStream,const nsCString& aString);
-//virtual void  DebugDump(ostream& aStream) const;
-
-
-/**************************************************************
-  Here comes the AutoString class which uses internal memory
-  (typically found on the stack) for its default buffer.
-  If the buffer needs to grow, it gets reallocated on the heap.
- **************************************************************/
-
-class NS_COM nsCAutoString : public nsCString {
-public: 
-
-    nsCAutoString();
-    nsCAutoString(const char* aString,PRInt32 aLength=-1);
-    nsCAutoString(const CBufDescriptor& aBuffer);
-    nsCAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
-    nsCAutoString(const nsStr& aString);
-    nsCAutoString(const nsCAutoString& aString);
-
-#ifdef AIX
-    nsCAutoString(const nsSubsumeCStr& aSubsumeStr);  // AIX requires a const
-#else
-    nsCAutoString(nsSubsumeCStr& aSubsumeStr);
-#endif // AIX
-    nsCAutoString(PRUnichar aChar);
-    virtual ~nsCAutoString();
-
-    nsCAutoString& operator=(const nsCString& aString) {nsCString::Assign(aString); return *this;}
-    nsCAutoString& operator=(const char* aCString) {nsCString::Assign(aCString); return *this;}
-    nsCAutoString& operator=(PRUnichar aChar) {nsCString::Assign(aChar); return *this;}
-    nsCAutoString& operator=(char aChar) {nsCString::Assign(aChar); return *this;}
-
-    /**
-     * Retrieve the size of this string
-     * @return string length
-     */
-    virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
-    
-    char mBuffer[kDefaultStringSize];
-};
-
-
-/***************************************************************
-  The subsumestr class is very unusual. 
-  It differs from a normal string in that it doesn't use normal
-  copy semantics when another string is assign to this. 
-  Instead, it "steals" the contents of the source string.
-
-  This is very handy for returning nsString classes as part of
-  an operator+(...) for example, in that it cuts down the number
-  of copy operations that must occur. 
-
-  You should probably not use this class unless you really know
-  what you're doing.
- ***************************************************************/
-class NS_COM nsSubsumeCStr : public nsCString {
-public:
-  nsSubsumeCStr(nsStr& aString);
-  nsSubsumeCStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
-  nsSubsumeCStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
-
-};
-
-
-#endif
-
-

mozilla/string/obsolete/nsString2.h

@@ -1,840 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-
-
-/***********************************************************************
-  MODULE NOTES:
-
-  See nsStr.h for a more general description of string classes.
-
-  This version of the nsString class offers many improvements over the
-  original version:
-    1. Wide and narrow chars
-    2. Allocators
-    3. Much smarter autostrings
-    4. Subsumable strings
- ***********************************************************************/
-
-
-#ifndef _nsString_
-#define _nsString_
-
-#include "prtypes.h"
-#include "nscore.h"
-#include <stdio.h>
-#include "nsString.h"
-#include "nsIAtom.h"
-#include "nsStr.h"
-#include "nsCRT.h"
-
-class nsISizeOfHandler;
-
-
-#define nsString2     nsString
-#define nsAutoString2 nsAutoString
-
-
-class NS_COM nsSubsumeStr;
-class NS_COM nsString : public nsStr {
-
-public: 
-
-  /**
-   * Default constructor. 
-   */
-  nsString();
-
-
-  /**
-   * This constructor accepts an isolatin string
-   * @param   aCString is a ptr to a 1-byte cstr
-   */
-  nsString(const char* aCString);
-
-  /**
-   * This constructor accepts a unichar string
-   * @param   aCString is a ptr to a 2-byte cstr
-   */
-  nsString(const PRUnichar* aString);
-
-  /**
-   * This is a copy constructor that accepts an nsStr
-   * @param   reference to another nsString
-   */
-  nsString(const nsStr&);
-
-  /**
-   * This is our copy constructor 
-   * @param   reference to another nsString
-   */
-  nsString(const nsString& aString);   
-
-  /**
-   * This constructor takes a subsumestr
-   * @param   reference to subsumestr
-   */
-  nsString(nsSubsumeStr& aSubsumeStr);   
-
-  /**
-   * Destructor
-   * 
-   */
-  virtual ~nsString();    
-
-  /**
-   * Retrieve the length of this string
-   * @return string length
-   */
-  inline PRInt32 Length() const { return (PRInt32)mLength; }
-
-  /**
-   * Retrieve the size of this string
-   * @return string length
-   */
-  virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
-
-
-  /**
-   * Call this method if you want to force a different string length
-   * @update  gess7/30/98
-   * @param   aLength -- contains new length for mStr
-   * @return
-   */
-  void SetLength(PRUint32 aLength) { 
-    Truncate(aLength);
-  }
-
-  /**
-   * Sets the new length of the string.
-   * @param   aLength is new string length.
-   * @return  nada
-   */
-  void SetCapacity(PRUint32 aLength);
-
-  /**
-   * This method truncates this string to given length.
-   *
-   * @param   anIndex -- new length of string
-   * @return  nada
-   */
-  void Truncate(PRInt32 anIndex=0);
-
-
-  /**
-   *  Determine whether or not the characters in this
-   *  string are in sorted order.
-   *  
-   *  @return  TRUE if ordered.
-   */
-  PRBool IsOrdered(void) const;
-
-  /**
-   *  Determine whether or not the characters in this
-   *  string are in store as 1 or 2 byte (unicode) strings.
-   *  
-   *  @return  TRUE if ordered.
-   */
-  PRBool IsUnicode(void) const {
-    PRBool result=PRBool(mCharSize==eTwoByte);
-    return result;
-  }
-
-  /**
-   *  Determine whether or not this string has a length of 0
-   *  
-   *  @return  TRUE if empty.
-   */
-  PRBool IsEmpty(void) const {
-    return PRBool(0==mLength);
-  }
-
-  /**********************************************************************
-    Getters/Setters...
-   *********************************************************************/
-
-   /**
-     * Retrieve const ptr to internal buffer; DO NOT TRY TO FREE IT!
-     */
-  const char* GetBuffer(void) const;
-  const PRUnichar* GetUnicode(void) const;
-
-
-   /**
-     * Get nth character.
-     */
-  PRUnichar operator[](PRUint32 anIndex) const;
-  PRUnichar CharAt(PRUint32 anIndex) const;
-  PRUnichar First(void) const;
-  PRUnichar Last(void) const;
-
-   /**
-     * Set nth character.
-     */
-  PRBool SetCharAt(PRUnichar aChar,PRUint32 anIndex);
-
-
-  /**********************************************************************
-    String concatenation methods...
-   *********************************************************************/
-
-  /**
-   * Create a new string by appending given string to this
-   * @param   aString -- 2nd string to be appended
-   * @return  new subsumable string
-   */
-  nsSubsumeStr operator+(const nsStr& aString);
-  nsSubsumeStr operator+(const nsString& aString);
-
-  /**
-   * create a new string by adding this to the given cstring
-   * @param   aCString is a ptr to cstring to be added to this
-   * @return  newly created string
-   */
-  nsSubsumeStr operator+(const char* aCString);
-
-  /**
-   * create a new string by adding this to the given prunichar*.
-   * @param   aString is a ptr to UC-string to be added to this
-   * @return  newly created string
-   */
-  nsSubsumeStr operator+(const PRUnichar* aString);
-
-  /**
-   * create a new string by adding this to the given char.
-   * @param   aChar is a char to be added to this
-   * @return  newly created string
-   */
-  nsSubsumeStr operator+(char aChar);
-
-  /**
-   * create a new string by adding this to the given char.
-   * @param   aChar is a unichar to be added to this
-   * @return  newly created string
-   */
-  nsSubsumeStr operator+(PRUnichar aChar);
-
-  /**********************************************************************
-    Lexomorphic transforms...
-   *********************************************************************/
-
-
-  /**
-   * Converts chars in this to lowercase
-   * @update  gess 7/27/98
-   */
-  void ToLowerCase();
-
-
-  /**
-   * Converts chars in this to lowercase, and
-   * stores them in aOut
-   * @update  gess 7/27/98
-   * @param   aOut is a string to contain result
-   */
-  void ToLowerCase(nsString& aString) const;
-
-  /**
-   * Converts chars in this to uppercase
-   * @update  gess 7/27/98
-   */
-  void ToUpperCase();
-
-  /**
-   * Converts chars in this to lowercase, and
-   * stores them in a given output string
-   * @update  gess 7/27/98
-   * @param   aOut is a string to contain result
-   */
-  void ToUpperCase(nsString& aString) const;
-
-
-  /**
-   *  This method is used to remove all occurances of the
-   *  characters found in aSet from this string.
-   *  
-   *  @param  aSet -- characters to be cut from this
-   *  @return *this 
-   */
-  nsString& StripChars(const char* aSet);
-  nsString& StripChar(char aChar);
-
-  /**
-   *  This method strips whitespace throughout the string
-   *  
-   *  @return  this
-   */
-  nsString& StripWhitespace();
-
-  /**
-   *  swaps occurence of 1 string for another
-   *  
-   *  @return  this
-   */
-  nsString& ReplaceChar(PRUnichar anOldChar,PRUnichar aNewChar);
-  nsString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
-
-  PRInt32 CountChar(PRUnichar aChar);
-
-  /**
-   *  This method trims characters found in aTrimSet from
-   *  either end of the underlying string.
-   *  
-   *  @param   aTrimSet -- contains chars to be trimmed from
-   *           both ends
-   *  @return  this
-   */
-  nsString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
-
-  /**
-   *  This method strips whitespace from string.
-   *  You can control whether whitespace is yanked from
-   *  start and end of string as well.
-   *  
-   *  @param   aEliminateLeading controls stripping of leading ws
-   *  @param   aEliminateTrailing controls stripping of trailing ws
-   *  @return  this
-   */
-  nsString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
-
-  /**
-   *  This method strips whitespace from string.
-   *  You can control whether whitespace is yanked from
-   *  start and end of string as well.
-   *  
-   *  @param   aEliminateLeading controls stripping of leading ws
-   *  @param   aEliminateTrailing controls stripping of trailing ws
-   *  @return  this
-   */
-  nsString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
-
-  /**********************************************************************
-    string conversion methods...
-   *********************************************************************/
-
-  /**
-   * This method constructs a new nsString is a clone of this string.
-   * 
-   */
-  nsString* ToNewString() const;
-
-  /**
-   * Creates an ISOLatin1 clone of this string
-   * Note that calls to this method should be matched with calls to Recycle().
-   * @return  ptr to new isolatin1 string
-   */
-  char* ToNewCString() const;
-
-  /**
-   * Creates an UTF8 clone of this string
-   * Note that calls to this method should be matched with calls to Recycle().
-   * @return  ptr to new isolatin1 string
-   */
-  char* ToNewUTF8String() const;
-
-  /**
-   * Creates a unicode clone of this string
-   * Note that calls to this method should be matched with calls to Recycle().
-   * @return  ptr to new unicode string
-   */
-  PRUnichar* ToNewUnicode() const;
-
-  /**
-   * Copies data from internal buffer onto given char* buffer
-   * NOTE: This only copies as many chars as will fit in given buffer (clips)
-   * @param aBuf is the buffer where data is stored
-   * @param aBuflength is the max # of chars to move to buffer
-   * @return ptr to given buffer
-   */
-  char* ToCString(char* aBuf,PRUint32 aBufLength,PRUint32 anOffset=0) const;
-
-  /**
-   * Perform string to float conversion.
-   * @param   aErrorCode will contain error if one occurs
-   * @return  float rep of string value
-   */
-  float ToFloat(PRInt32* aErrorCode) const;
-
-  /**
-   * Try to derive the radix from the value contained in this string
-   * @return  kRadix10, kRadix16 or kAutoDetect (meaning unknown)
-   */
-  PRUint32  DetermineRadix(void);
-
-  /**
-   * Perform string to int conversion.
-   * @param   aErrorCode will contain error if one occurs
-   * @return  int rep of string value
-   */
-  PRInt32   ToInteger(PRInt32* aErrorCode,PRUint32 aRadix=kRadix10) const;
-
-
-  /**********************************************************************
-    String manipulation methods...                
-   *********************************************************************/
-
-  /**
-   * Functionally equivalent to assign or operator=
-   * 
-   */
-  nsString& SetString(const char* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
-  nsString& SetString(const PRUnichar* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
-  nsString& SetString(const nsString& aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
-
-  /**
-   * assign given string to this string
-   * @param   aStr: buffer to be assigned to this 
-   * @param   alength is the length of the given str (or -1)
-              if you want me to determine its length
-   * @return  this
-   */
-  nsString& Assign(const nsStr& aString,PRInt32 aCount=-1);
-  nsString& Assign(const char* aString,PRInt32 aCount=-1);
-  nsString& Assign(const PRUnichar* aString,PRInt32 aCount=-1);
-  nsString& Assign(char aChar);
-  nsString& Assign(PRUnichar aChar);
-
-  /**
-   * here come a bunch of assignment operators...
-   * @param   aString: string to be added to this
-   * @return  this
-   */
-  nsString& operator=(const nsString& aString) {return Assign(aString);}
-  nsString& operator=(const nsStr& aString) {return Assign(aString);}
-  nsString& operator=(char aChar) {return Assign(aChar);}
-  nsString& operator=(PRUnichar aChar) {return Assign(aChar);}
-  nsString& operator=(const char* aCString) {return Assign(aCString);}
-  nsString& operator=(const PRUnichar* aString) {return Assign(aString);}
-  #ifdef AIX
-  nsString& operator=(const nsSubsumeStr& aSubsumeString);  // AIX requires a const here
-  #else
-  nsString& operator=(nsSubsumeStr& aSubsumeString);
-  #endif
-
-  /**
-   * Here's a bunch of methods that append varying types...
-   * @param   various...
-   * @return  this
-   */
-  nsString& operator+=(const nsStr& aString){return Append(aString,aString.mLength);}
-  nsString& operator+=(const nsString& aString){return Append(aString,aString.mLength);}
-  nsString& operator+=(const char* aCString) {return Append(aCString);}
-  //nsString& operator+=(char aChar){return Append(aChar);}
-  nsString& operator+=(const PRUnichar* aUCString) {return Append(aUCString);}
-  nsString& operator+=(PRUnichar aChar){return Append(aChar);}
-
-  /*
-   *  Appends n characters from given string to this,
-   *  This version computes the length of your given string
-   *  
-   *  @param   aString is the source to be appended to this
-   *  @return  number of chars copied
-   */
-  nsString& Append(const nsStr& aString) {return Append(aString,aString.mLength);}
-  nsString& Append(const nsString& aString) {return Append(aString,aString.mLength);}
- 
-
-  /*
-   *  Appends n characters from given string to this,
-   *  
-   *  @param   aString is the source to be appended to this
-   *  @param   aCount -- number of chars to copy; -1 tells us to compute the strlen for you
-   *  @return  number of chars copied
-   */
-  nsString& Append(const nsStr& aString,PRInt32 aCount);
-  nsString& Append(const nsString& aString,PRInt32 aCount);
-  nsString& Append(const char* aString,PRInt32 aCount=-1);
-  nsString& Append(const PRUnichar* aString,PRInt32 aCount=-1);
-  nsString& Append(char aChar);
-  nsString& Append(PRUnichar aChar);
-  nsString& Append(PRInt32 aInteger,PRInt32 aRadix=10); //radix=8,10 or 16
-  nsString& Append(float aFloat);
-             
-  /*
-   *  Copies n characters from this string to given string,
-   *  starting at the leftmost offset.
-   *  
-   *  
-   *  @param   aCopy -- Receiving string
-   *  @param   aCount -- number of chars to copy
-   *  @return  number of chars copied
-   */
-  PRUint32 Left(nsString& aCopy,PRInt32 aCount) const;
-
-  /*
-   *  Copies n characters from this string to given string,
-   *  starting at the given offset.
-   *  
-   *  
-   *  @param   aCopy -- Receiving string
-   *  @param   aCount -- number of chars to copy
-   *  @param   anOffset -- position where copying begins
-   *  @return  number of chars copied
-   */
-  PRUint32 Mid(nsString& aCopy,PRUint32 anOffset,PRInt32 aCount) const;
-
-  /*
-   *  Copies n characters from this string to given string,
-   *  starting at rightmost char.
-   *  
-   *  
-   *  @param  aCopy -- Receiving string
-   *  @param  aCount -- number of chars to copy
-   *  @return number of chars copied
-   */
-  PRUint32 Right(nsString& aCopy,PRInt32 aCount) const;
-
-  /*
-   *  This method inserts n chars from given string into this
-   *  string at str[anOffset].
-   *  
-   *  @param  aCopy -- String to be inserted into this
-   *  @param  anOffset -- insertion position within this str
-   *  @param  aCount -- number of chars to be copied from aCopy
-   *  @return number of chars inserted into this.
-   */
-  nsString& Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
-
-  /**
-   * Insert a given string into this string at
-   * a specified offset.
-   *
-   * @param   aString* to be inserted into this string
-   * @param   anOffset is insert pos in str 
-   * @return  the number of chars inserted into this string
-   */
-  nsString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
-  nsString& Insert(const PRUnichar* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
-
-  /**
-   * Insert a single char into this string at
-   * a specified offset.
-   *
-   * @param   character to be inserted into this string
-   * @param   anOffset is insert pos in str 
-   * @return  the number of chars inserted into this string
-   */
-  //nsString& Insert(char aChar,PRUint32 anOffset);
-  nsString& Insert(PRUnichar aChar,PRUint32 anOffset);
-
-  /*
-   *  This method is used to cut characters in this string
-   *  starting at anOffset, continuing for aCount chars.
-   *  
-   *  @param  anOffset -- start pos for cut operation
-   *  @param  aCount -- number of chars to be cut
-   *  @return *this
-   */
-  nsString& Cut(PRUint32 anOffset,PRInt32 aCount);
-
-
-  /**********************************************************************
-    Searching methods...                
-   *********************************************************************/
- 
-  /**
-   *  Search for given character within this string.
-   *  This method does so by using a binary search,
-   *  so your string HAD BETTER BE ORDERED!
-   *  
-   *  @param   aChar is the unicode char to be found
-   *  @return  offset in string, or -1 (kNotFound)
-   */
-  PRInt32 BinarySearch(PRUnichar aChar) const;
-
-  /**
-   *  Search for given substring within this string
-   *  
-   *  @param   aString is substring to be sought in this
-   *  @param   aIgnoreCase selects case sensitivity
-   *  @param   anOffset tells us where in this strig to start searching
-   *  @return  offset in string, or -1 (kNotFound)
-   */
-  PRInt32 Find(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-  PRInt32 Find(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-  PRInt32 Find(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-  PRInt32 Find(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-
-
-  /**
-   *  Search for given char within this string
-   *  
-   *  @param   aString is substring to be sought in this
-   *  @param   anOffset tells us where in this strig to start searching
-   *  @param   aIgnoreCase selects case sensitivity
-   *  @return  find pos in string, or -1 (kNotFound)
-   */
-  //PRInt32 Find(PRUnichar aChar,PRInt32 offset=-1,PRBool aIgnoreCase=PR_FALSE) const;
-  PRInt32 FindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-
-  /**
-   * This method searches this string for the first character
-   * found in the given charset
-   * @param aString contains set of chars to be found
-   * @param anOffset tells us where to start searching in this
-   * @return -1 if not found, else the offset in this
-   */
-  PRInt32 FindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
-  PRInt32 FindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
-  PRInt32 FindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
-
-
-  /**
-   * This methods scans the string backwards, looking for the given string
-   * @param   aString is substring to be sought in this
-   * @param   aIgnoreCase tells us whether or not to do caseless compare
-   *  @param   anOffset tells us where in this strig to start searching (counting from left)
-   */
-  PRInt32 RFind(const char* aCString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-  PRInt32 RFind(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-  PRInt32 RFind(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-  PRInt32 RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-
-
-  /**
-   *  Search for given char within this string
-   *  
-   *  @param   aString is substring to be sought in this
-   *  @param   anOffset tells us where in this strig to start searching (counting from left)
-   *  @param   aIgnoreCase selects case sensitivity
-   *  @return  find pos in string, or -1 (kNotFound)
-   */
-  //PRInt32 RFind(PRUnichar aChar,PRInt32 offset=-1,PRBool aIgnoreCase=PR_FALSE) const;
-  PRInt32 RFindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
-
-  /**
-   * This method searches this string for the last character
-   * found in the given string
-   * @param aString contains set of chars to be found
-   *  @param   anOffset tells us where in this strig to start searching (counting from left)
-   * @return -1 if not found, else the offset in this
-   */
-  PRInt32 RFindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
-  PRInt32 RFindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
-  PRInt32 RFindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
-
-
-  /**********************************************************************
-    Comparison methods...                
-   *********************************************************************/
-
-  /**
-   * Compares a given string type to this string. 
-   * @update  gess 7/27/98
-   * @param   S is the string to be compared
-   * @param   aIgnoreCase tells us how to treat case
-   * @param   aCount tells us how many chars to compare
-   * @return  -1,0,1
-   */
-  virtual PRInt32 Compare(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-
-  /**
-   * These methods compare a given string type to this one
-   * @param aString is the string to be compared to this
-   * @return  TRUE or FALSE
-   */
-  PRBool  operator==(const nsString &aString) const;
-  PRBool  operator==(const nsStr &aString) const;
-  PRBool  operator==(const char *aString) const;
-  PRBool  operator==(const PRUnichar* aString) const;
-
-  /**
-   * These methods perform a !compare of a given string type to this 
-   * @param aString is the string to be compared to this
-   * @return  TRUE 
-   */
-  PRBool  operator!=(const nsString &aString) const;
-  PRBool  operator!=(const nsStr &aString) const;
-  PRBool  operator!=(const char* aString) const;
-  PRBool  operator!=(const PRUnichar* aString) const;
-
-  /**
-   * These methods test if a given string is < than this
-   * @param aString is the string to be compared to this
-   * @return  TRUE or FALSE
-   */
-  PRBool  operator<(const nsString &aString) const;
-  PRBool  operator<(const nsStr &aString) const;
-  PRBool  operator<(const char* aString) const;
-  PRBool  operator<(const PRUnichar* aString) const;
-
-  /**
-   * These methods test if a given string is > than this
-   * @param aString is the string to be compared to this
-   * @return  TRUE or FALSE
-   */
-  PRBool  operator>(const nsString &aString) const;
-  PRBool  operator>(const nsStr &S) const;
-  PRBool  operator>(const char* aString) const;
-  PRBool  operator>(const PRUnichar* aString) const;
-
-  /**
-   * These methods test if a given string is <= than this
-   * @param aString is the string to be compared to this
-   * @return  TRUE or FALSE
-   */
-  PRBool  operator<=(const nsString &aString) const;
-  PRBool  operator<=(const nsStr &S) const;
-  PRBool  operator<=(const char* aString) const;
-  PRBool  operator<=(const PRUnichar* aString) const;
-
-  /**
-   * These methods test if a given string is >= than this
-   * @param aString is the string to be compared to this
-   * @return  TRUE or FALSE
-   */
-  PRBool  operator>=(const nsString &aString) const;
-  PRBool  operator>=(const nsStr &S) const;
-  PRBool  operator>=(const char* aString) const;
-  PRBool  operator>=(const PRUnichar* aString) const;
-
-  /**
-   * Compare this to given string; note that we compare full strings here.
-   * The optional length argument just lets us know how long the given string is.
-   * If you provide a length, it is compared to length of this string as an
-   * optimization.
-   * 
-   * @param  aString -- the string to compare to this
-   * @param  aCount  -- number of chars to be compared.
-   * @return TRUE if equal
-   */
-  PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
-  PRBool  Equals(/*FIX: const */nsIAtom* anAtom,PRBool aIgnoreCase) const;   
-  PRBool  Equals(const PRUnichar* s1, const PRUnichar* s2,PRBool aIgnoreCase=PR_FALSE) const;
-
-  PRBool  EqualsIgnoreCase(const nsString& aString) const;
-  PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aCount=-1) const;
-  PRBool  EqualsIgnoreCase(/*FIX: const */nsIAtom *aAtom) const;
-  PRBool  EqualsIgnoreCase(const PRUnichar* s1, const PRUnichar* s2) const;
-
-  /**
-   *  Determine if given buffer is plain ascii
-   *  
-   *  @param   aBuffer -- if null, then we test *this, otherwise we test given buffer
-   *  @return  TRUE if is all ascii chars or if strlen==0
-   */
-  PRBool IsASCII(const PRUnichar* aBuffer=0);
-
-
-  /**
-   *  Determine if given char is a valid space character
-   *  
-   *  @param   aChar is character to be tested
-   *  @return  TRUE if is valid space char
-   */
-  static  PRBool IsSpace(PRUnichar ch);
-
-  /**
-   *  Determine if given char in valid alpha range
-   *  
-   *  @param   aChar is character to be tested
-   *  @return  TRUE if in alpha range
-   */
-  static  PRBool IsAlpha(PRUnichar ch);
-
-  /**
-   *  Determine if given char is valid digit
-   *  
-   *  @param   aChar is character to be tested
-   *  @return  TRUE if char is a valid digit
-   */
-  static  PRBool IsDigit(PRUnichar ch);
-
-  static  void        Recycle(nsString* aString);
-  static  nsString*  CreateString(void);
-
-};
-
-extern NS_COM int fputs(const nsString& aString, FILE* out);
-//ostream& operator<<(ostream& aStream,const nsString& aString);
-//virtual void  DebugDump(ostream& aStream) const;
-
-
-/**************************************************************
-  Here comes the AutoString class which uses internal memory
-  (typically found on the stack) for its default buffer.
-  If the buffer needs to grow, it gets reallocated on the heap.
- **************************************************************/
-
-class NS_COM nsAutoString : public nsString {
-public: 
-
-    nsAutoString();
-    nsAutoString(const char* aCString,PRInt32 aLength=-1);
-    nsAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
-
-    nsAutoString(const CBufDescriptor& aBuffer);    
-    nsAutoString(const nsStr& aString);
-    nsAutoString(const nsAutoString& aString);
-#ifdef AIX
-    nsAutoString(const nsSubsumeStr& aSubsumeStr);  // AIX requires a const
-#else
-    nsAutoString(nsSubsumeStr& aSubsumeStr);
-#endif // AIX
-    nsAutoString(PRUnichar aChar);
-    virtual ~nsAutoString();
-
-    nsAutoString& operator=(const nsStr& aString) {nsString::Assign(aString); return *this;}
-    nsAutoString& operator=(const nsAutoString& aString) {nsString::Assign(aString); return *this;}
-    nsAutoString& operator=(const char* aCString) {nsString::Assign(aCString); return *this;}
-    nsAutoString& operator=(char aChar) {nsString::Assign(aChar); return *this;}
-    nsAutoString& operator=(const PRUnichar* aBuffer) {nsString::Assign(aBuffer); return *this;}
-    nsAutoString& operator=(PRUnichar aChar) {nsString::Assign(aChar); return *this;}
-
-    /**
-     * Retrieve the size of this string
-     * @return string length
-     */
-    virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
-    
-    char mBuffer[kDefaultStringSize<<eTwoByte];
-};
-
-
-
-/***************************************************************
-  The subsumestr class is very unusual. 
-  It differs from a normal string in that it doesn't use normal
-  copy semantics when another string is assign to this. 
-  Instead, it "steals" the contents of the source string.
-
-  This is very handy for returning nsString classes as part of
-  an operator+(...) for example, in that it cuts down the number
-  of copy operations that must occur. 
-
-  You should probably not use this class unless you really know
-  what you're doing.
- ***************************************************************/
-class NS_COM nsSubsumeStr : public nsString {
-public:
-  nsSubsumeStr(nsStr& aString);
-  nsSubsumeStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
-  nsSubsumeStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
-};
-
-
-
-#endif
-
-

mozilla/string/obsolete/nsXPIDLString.cpp

@@ -1,179 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsDebug.h"
-#include "nsIAllocator.h"
-#include "nsXPIDLString.h"
-#include "plstr.h"
-
-// If the allocator changes, fix it here.
-#define XPIDL_STRING_ALLOC(__len)  ((PRUnichar*) nsAllocator::Alloc((__len) * sizeof(PRUnichar)))
-#define XPIDL_CSTRING_ALLOC(__len) ((char*) nsAllocator::Alloc((__len) * sizeof(char)))
-#define XPIDL_FREE(__ptr)          (nsAllocator::Free(__ptr))
-
-////////////////////////////////////////////////////////////////////////
-// nsXPIDLString
-
-nsXPIDLString::nsXPIDLString()
-    : mBuf(0),
-      mBufOwner(PR_FALSE)
-{
-}
-
-
-nsXPIDLString::~nsXPIDLString()
-{
-    if (mBufOwner && mBuf)
-        XPIDL_FREE(mBuf);
-}
-
-
-nsXPIDLString::operator const PRUnichar*()
-{
-    return mBuf;
-}
-
-
-PRUnichar*
-nsXPIDLString::Copy(const PRUnichar* aString)
-{
-    NS_ASSERTION(aString, "null ptr");
-    if (! aString)
-        return 0;
-
-    PRInt32 len = 0;
-
-    {
-        const PRUnichar* p = aString;
-        while (*p++)
-            len++;
-    }
-
-    PRUnichar* result = XPIDL_STRING_ALLOC(len + 1);
-    if (result) {
-        PRUnichar* q = result;
-        while (*aString) {
-            *q = *aString;
-            q++;
-            aString++;
-        }
-        *q = '\0';
-    }
-    return result;
-}
-
-
-PRUnichar**
-nsXPIDLString::StartAssignmentByValue()
-{
-    if (mBufOwner && mBuf)
-        XPIDL_FREE(mBuf);
-
-    mBuf = 0;
-    mBufOwner = PR_TRUE;
-    return &mBuf;
-}
-
-
-const PRUnichar**
-nsXPIDLString::StartAssignmentByReference()
-{
-    if (mBufOwner && mBuf)
-        XPIDL_FREE(mBuf);
-
-    mBuf = 0;
-    mBufOwner = PR_FALSE;
-    return (const PRUnichar**) &mBuf;
-}
-
-
-////////////////////////////////////////////////////////////////////////
-// nsXPIDLCString
-
-nsXPIDLCString::nsXPIDLCString()
-    : mBuf(0),
-      mBufOwner(PR_FALSE)
-{
-}
-
-
-nsXPIDLCString::~nsXPIDLCString()
-{
-    if (mBufOwner && mBuf)
-        XPIDL_FREE(mBuf);
-}
-
-
-nsXPIDLCString& nsXPIDLCString::operator =(const char* aCString)
-{
-    if (mBufOwner && mBuf)
-        XPIDL_FREE(mBuf);
-	
-    mBuf = Copy(aCString);
-    mBufOwner = PR_TRUE;
-    
-    return *this;
-}
-
-
-nsXPIDLCString::operator const char*()
-{
-    return mBuf;
-}
-
-
-char*
-nsXPIDLCString::Copy(const char* aCString)
-{
-    NS_ASSERTION(aCString, "null ptr");
-    if (! aCString)
-        return 0;
-
-    PRInt32 len = PL_strlen(aCString);
-    char* result = XPIDL_CSTRING_ALLOC(len + 1);
-    if (result)
-        PL_strcpy(result, aCString);
-
-    return result;
-}
-
-
-char**
-nsXPIDLCString::StartAssignmentByValue()
-{
-    if (mBufOwner && mBuf)
-        XPIDL_FREE(mBuf);
-
-    mBuf = 0;
-    mBufOwner = PR_TRUE;
-    return &mBuf;
-}
-
-
-const char**
-nsXPIDLCString::StartAssignmentByReference()
-{
-    if (mBufOwner && mBuf)
-        XPIDL_FREE(mBuf);
-
-    mBuf = 0;
-    mBufOwner = PR_FALSE;
-    return (const char**) &mBuf;
-}
-
-

mozilla/string/obsolete/nsXPIDLString.h

@@ -1,302 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-/*
-
-  A set of string wrapper classes that ease transition to use of XPIDL
-  interfaces. nsXPIDLString and nsXPIDLCString are to XPIDL `wstring'
-  and `string' out params as nsCOMPtr is to generic XPCOM interface
-  pointers. They help you deal with object ownership.
-
-  Consider the following interface:
-
-    interface nsIFoo {
-      attribute string Bar;
-    };
-
-  This will generate the following C++ header file:
-
-    class nsIFoo {
-      NS_IMETHOD SetBar(const PRUnichar* aValue);
-      NS_IMETHOD GetBar(PRUnichar* *aValue);
-    };
-
-  The GetBar() method will allocate a copy of the nsIFoo object's
-  "bar" attribute, and leave you to deal with freeing it:
-
-    nsIFoo* aFoo; // assume we get this somehow
-    PRUnichar* bar;
-    aFoo->GetFoo(&bar);
-    // Use bar here...
-    printf("bar is %s!\n", bar);
-    nsAllocator::Free(bar);
-
-  This makes your life harder, because you need to convolute your code
-  to ensure that you don't leak `bar'.
-
-  Enter nsXPIDLString, which manages the ownership of the allocated
-  string, and automatically destroys it when the nsXPIDLString goes
-  out of scope:
-
-    nsIFoo* aFoo;
-    nsXPIDLString bar;
-    aFoo->GetFoo( getter_Copies(bar) );
-    // Use bar here...
-    printf("bar is %s!\n", (const char*) bar);
-    // no need to remember to nsAllocator::Free().
-
-  Like nsCOMPtr, nsXPIDLString uses some syntactic sugar to make it
-  painfully clear exactly what the code expects. You need to wrap an
-  nsXPIDLString object with either `getter_Copies()' or
-  `getter_Shares()' before passing it to a getter: these tell the
-  nsXPIDLString how ownership is being handled.
-
-  In the case of `getter_Copies()', the callee is allocating a copy
-  (which is usually the case). In the case of `getter_Shares()', the
-  callee is returning a const reference to `the real deal' (this can
-  be done using the [shared] attribute in XPIDL).
-
- */
-
-#ifndef nsXPIDLString_h__
-#define nsXPIDLString_h__
-
-#include "nsCom.h"
-#include "prtypes.h"
-
-#ifndef __PRUNICHAR__
-#define __PRUNICHAR__
-typedef PRUint16 PRUnichar;
-#endif /* __PRUNICHAR__ */
-
-////////////////////////////////////////////////////////////////////////
-// nsXPIDLString
-//
-//   A wrapper for Unicode strings. With the |getter_Copies()| and
-//   |getter_Shares()| helper functions, this can be used instead of
-//   the "naked" |PRUnichar*| interface for |wstring| parameters in
-//   XPIDL interfaces.
-//
-
-class NS_COM nsXPIDLString {
-private:
-    PRUnichar* mBuf;
-    PRBool     mBufOwner;
-
-    PRUnichar** StartAssignmentByValue();
-    const PRUnichar** StartAssignmentByReference();
-
-public:
-    /**
-     * Construct a new, uninitialized wrapper for a Unicode string.
-     */
-    nsXPIDLString();
-
-    virtual ~nsXPIDLString();
-
-    /**
-     * Return a reference to the immutable Unicode string.
-     */
-    operator const PRUnichar*();
-
-    /**
-     * Make a copy of the Unicode string. Use this function in the
-     * callee to ensure that the correct memory allocator is used.
-     */
-    static PRUnichar* Copy(const PRUnichar* aString);
-
-    // A helper class for assignment-by-value. This class is an
-    // implementation detail and should not be considered part of the
-    // public interface.
-    class NS_COM GetterCopies {
-    private:
-        nsXPIDLString& mXPIDLString;
-
-    public:
-        GetterCopies(nsXPIDLString& aXPIDLString)
-            : mXPIDLString(aXPIDLString) {}
-
-        operator PRUnichar**() {
-            return mXPIDLString.StartAssignmentByValue();
-        }
-
-        friend GetterCopies getter_Copies(nsXPIDLString& aXPIDLString);
-    };
-
-    friend class GetterCopies;
-
-    // A helper class for assignment-by-reference. This class is an
-    // implementation detail and should not be considered part of the
-    // public interface.
-    class NS_COM GetterShares {
-    private:
-        nsXPIDLString& mXPIDLString;
-
-    public:
-        GetterShares(nsXPIDLString& aXPIDLString)
-            : mXPIDLString(aXPIDLString) {}
-
-        operator const PRUnichar**() {
-            return mXPIDLString.StartAssignmentByReference();
-        }
-
-        friend GetterShares getter_Shares(nsXPIDLString& aXPIDLString);
-    };
-
-    friend class GetterShares;
-
-private:
-    // not to be implemented
-    nsXPIDLString(nsXPIDLString& /* aXPIDLString */) {}
-    nsXPIDLString& operator =(nsXPIDLString& /* aXPIDLString */) { return *this; }
-};
-
-
-/**
- * Use this function to "wrap" the nsXPIDLString object that is to
- * receive an |out| value.
- */
-inline nsXPIDLString::GetterCopies
-getter_Copies(nsXPIDLString& aXPIDLString)
-{
-    return nsXPIDLString::GetterCopies(aXPIDLString);
-}
-
-/**
- * Use this function to "wrap" the nsXPIDLString object that is to
- * receive a |[shared] out| value.
- */
-inline nsXPIDLString::GetterShares
-getter_Shares(nsXPIDLString& aXPIDLString)
-{
-    return nsXPIDLString::GetterShares(aXPIDLString);
-}
-
-
-
-////////////////////////////////////////////////////////////////////////
-// nsXPIDLCString
-//
-//   A wrapper for Unicode strings. With the |getter_Copies()| and
-//   |getter_Shares()| helper functions, this can be used instead of
-//   the "naked" |char*| interface for |string| parameters in XPIDL
-//   interfaces.
-//
-
-class NS_COM nsXPIDLCString {
-private:
-    char*  mBuf;
-    PRBool mBufOwner;
-
-    char** StartAssignmentByValue();
-    const char** StartAssignmentByReference();
-
-public:
-    /**
-     * Construct a new, uninitialized wrapper for a single-byte string.
-     */
-    nsXPIDLCString();
-
-    virtual ~nsXPIDLCString();
-
-	/**
-	 * Assign a single-byte string to this wrapper. Copies and owns the result.
-	 */
-	nsXPIDLCString& operator =(const char* aString);
-
-    /**
-     * Return a reference to the immutable single-byte string.
-     */
-    operator const char*();
-
-    /**
-     * Make a copy of the single-byte string. Use this function in the
-     * callee to ensure that the correct memory allocator is used.
-     */
-    static char* Copy(const char* aString);
-
-    // A helper class for assignment-by-value. This class is an
-    // implementation detail and should not be considered part of the
-    // public interface.
-    class NS_COM GetterCopies {
-    private:
-        nsXPIDLCString& mXPIDLString;
-
-    public:
-        GetterCopies(nsXPIDLCString& aXPIDLString)
-            : mXPIDLString(aXPIDLString) {}
-
-        operator char**() {
-            return mXPIDLString.StartAssignmentByValue();
-        }
-
-        friend GetterCopies getter_Copies(nsXPIDLCString& aXPIDLString);
-    };
-
-    friend class GetterCopies;
-
-    // A helper class for assignment-by-reference. This class is an
-    // implementation detail and should not be considered part of the
-    // public interface.
-    class NS_COM GetterShares {
-    private:
-        nsXPIDLCString& mXPIDLString;
-
-    public:
-        GetterShares(nsXPIDLCString& aXPIDLString)
-            : mXPIDLString(aXPIDLString) {}
-
-        operator const char**() {
-            return mXPIDLString.StartAssignmentByReference();
-        }
-
-        friend GetterShares getter_Shares(nsXPIDLCString& aXPIDLString);
-    };
-
-    friend class GetterShares;
-
-private:
-    // not to be implemented
-    nsXPIDLCString(nsXPIDLCString& /* aXPIDLString */) {}
-    nsXPIDLCString& operator =(nsXPIDLCString& /* aXPIDLCString */) { return *this; }
-};
-
-/**
- * Use this function to "wrap" the nsXPIDLCString object that is to
- * receive an |out| value.
- */
-inline nsXPIDLCString::GetterCopies
-getter_Copies(nsXPIDLCString& aXPIDLString)
-{
-    return nsXPIDLCString::GetterCopies(aXPIDLString);
-}
-
-
-/**
- * Use this function to "wrap" the nsXPIDLCString object that is to
- * receive a |[shared] out| value.
- */
-inline nsXPIDLCString::GetterShares
-getter_Shares(nsXPIDLCString& aXPIDLString)
-{
-    return nsXPIDLCString::GetterShares(aXPIDLString);
-}
-
-
-
-#endif // nsXPIDLString_h__

mozilla/xpcom/ds/MANIFEST

@@ -1,30 +0,0 @@
-nsAVLTree.h
-nsCppSharedAllocator.h
-nsCRT.h
-nsDeque.h
-nsEnumeratorUtils.h
-nsHashtable.h
-nsHashtableEnumerator.h
-nsIArena.h
-nsIBuffer.h
-nsIByteBuffer.h
-nsIObserverList.h
-nsIPageManager.h
-nsIProperties.h
-nsISimpleEnumerator.h
-nsISizeOfHandler.h
-nsIUnicharBuffer.h
-nsIVariant.h
-nsInt64.h
-nsQuickSort.h
-nsStr.h
-nsString.h
-nsString2.h
-nsSupportsPrimitives.h
-nsTime.h
-nsUnitConversion.h
-nsVector.h
-nsVoidArray.h
-nsXPIDLString.h
-plvector.h
-nsTextFormater.h

mozilla/xpcom/ds/MANIFEST_IDL

@@ -1,6 +0,0 @@
-nsIAtom.idl
-nsICollection.idl
-nsIEnumerator.idl
-nsIObserver.idl
-nsIObserverService.idl
-nsISupportsArray.idl

mozilla/xpcom/ds/Makefile.in

@@ -1,113 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= xpcom
-XPIDL_MODULE	= xpcom_ds
-LIBRARY_NAME	= xpcomds_s
-
-REQUIRES	= xpcom uconv unicharutil
-
-CPPSRCS		= \
-		nsArena.cpp \
-		nsAtomTable.cpp \
-		nsAVLTree.cpp \
-		nsByteBuffer.cpp \
-		nsCRT.cpp \
-		nsConjoiningEnumerator.cpp \
-		nsDeque.cpp \
-		nsEmptyEnumerator.cpp \
-		nsEnumeratorUtils.cpp \
-		nsHashtable.cpp \
-		nsHashtableEnumerator.cpp \
-		nsObserver.cpp \
-		nsObserverList.cpp \
-		nsObserverService.cpp \
-		nsProperties.cpp \
-		nsQuickSort.cpp \
-		nsSizeOfHandler.cpp \
-		nsStr.cpp \
-		nsString.cpp \
-		nsString2.cpp \
-		nsSupportsArray.cpp \
-		nsSupportsArrayEnumerator.cpp \
-		nsSupportsPrimitives.cpp \
-		nsUnicharBuffer.cpp \
-		nsVariant.cpp \
-		nsVoidArray.cpp \
-		nsXPIDLString.cpp \
-		plvector.cpp \
-		nsTextFormater.cpp \
-		$(NULL)
-
-EXPORTS		= \
-		nsAVLTree.h \
-		nsCppSharedAllocator.h \
-		nsCRT.h \
-		nsDeque.h \
-		nsEnumeratorUtils.h \
-		nsHashtable.h \
-		nsHashtableEnumerator.h \
-		nsIArena.h \
-		nsIByteBuffer.h \
-		nsIObserverList.h \
-		nsIProperties.h \
-		nsISimpleEnumerator.h \
-		nsISizeOfHandler.h \
-		nsIUnicharBuffer.h \
-		nsIVariant.h \
-		nsInt64.h \
-		nsQuickSort.h \
-		nsStr.h \
-		nsString.h \
-		nsString2.h \
-		nsSupportsPrimitives.h \
-		nsTime.h \
-		nsUnitConversion.h \
-		nsVector.h \
-		nsVoidArray.h \
-		nsXPIDLString.h \
-		plvector.h \
-		nsTextFormater.h \
-		$(NULL)			
-
-XPIDLSRCS	= \
-		nsIAtom.idl \
-		nsICollection.idl \
-		nsIEnumerator.idl \
-		nsIObserver.idl \
-		nsIObserverService.idl \
-		nsISupportsArray.idl \
-		nsISupportsPrimitives.idl \
-		$(NULL)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
-

mozilla/xpcom/ds/bufferRoutines.h

@@ -1,758 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-/******************************************************************************************
-  MODULE NOTES:
-
-  This file contains the workhorse copy and shift functions used in nsStrStruct.
-  Ultimately, I plan to make the function pointers in this system available for 
-  use by external modules. They'll be able to install their own "handlers".
-  Not so, today though.
-
-*******************************************************************************************/
-
-#ifndef _BUFFERROUTINES_H
-#define _BUFFERROUTINES_H
-
-#include "nsCRT.h"
-
-#ifndef RICKG_TESTBED
-#include "nsUnicharUtilCIID.h"
-#include "nsIServiceManager.h"
-#include "nsICaseConversion.h"
-#endif
-
-#define KSHIFTLEFT  (0)
-#define KSHIFTRIGHT (1)
-
-
-inline PRUnichar GetUnicharAt(const char* aString,PRUint32 anIndex) {
-  return ((PRUnichar*)aString)[anIndex];
-}
-
-inline PRUnichar GetCharAt(const char* aString,PRUint32 anIndex) {
-  return (PRUnichar)aString[anIndex];
-}
-
-//----------------------------------------------------------------------------------------
-//
-//  This set of methods is used to shift the contents of a char buffer.
-//  The functions are differentiated by shift direction and the underlying charsize.
-//
-
-/**
- * This method shifts single byte characters left by a given amount from an given offset.
- * @update	gess 01/04/99
- * @param   aDest is a ptr to a cstring where left-shift is to be performed
- * @param   aLength is the known length of aDest
- * @param   anOffset is the index into aDest where shifting shall begin
- * @param   aCount is the number of chars to be "cut"
- */
-void ShiftCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
-  char*   dst = aDest+anOffset;
-  char*   src = aDest+anOffset+aCount;
-
-  memmove(dst,src,aLength-(aCount+anOffset));
-}
-
-/**
- * This method shifts single byte characters right by a given amount from an given offset.
- * @update	gess 01/04/99
- * @param   aDest is a ptr to a cstring where the shift is to be performed
- * @param   aLength is the known length of aDest
- * @param   anOffset is the index into aDest where shifting shall begin
- * @param   aCount is the number of chars to be "inserted"
- */
-void ShiftCharsRight(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
-  char* src = aDest+anOffset;
-  char* dst = aDest+anOffset+aCount;
-
-  memmove(dst,src,aLength-anOffset);
-}
-
-/**
- * This method shifts unicode characters by a given amount from an given offset.
- * @update	gess 01/04/99
- * @param   aDest is a ptr to a cstring where the shift is to be performed
- * @param   aLength is the known length of aDest
- * @param   anOffset is the index into aDest where shifting shall begin
- * @param   aCount is the number of chars to be "cut"
- */
-void ShiftDoubleCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
-  PRUnichar* root=(PRUnichar*)aDest;
-  PRUnichar* dst = root+anOffset;
-  PRUnichar* src = root+anOffset+aCount;
-
-  memmove(dst,src,(aLength-(aCount+anOffset))*sizeof(PRUnichar));
-}
-
-
-/**
- * This method shifts unicode characters by a given amount from an given offset.
- * @update	gess 01/04/99
- * @param   aDest is a ptr to a cstring where the shift is to be performed
- * @param   aLength is the known length of aDest
- * @param   anOffset is the index into aDest where shifting shall begin
- * @param   aCount is the number of chars to be "inserted"
- */
-void ShiftDoubleCharsRight(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
-  PRUnichar* root=(PRUnichar*)aDest;
-  PRUnichar* src = root+anOffset;
-  PRUnichar* dst = root+anOffset+aCount;
-
-  memmove(dst,src,sizeof(PRUnichar)*(aLength-anOffset));
-}
-
-
-typedef void (*ShiftChars)(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount);
-ShiftChars gShiftChars[2][2]= {
-  {&ShiftCharsLeft,&ShiftCharsRight},
-  {&ShiftDoubleCharsLeft,&ShiftDoubleCharsRight}
-};
-
-
-//----------------------------------------------------------------------------------------
-//
-//  This set of methods is used to copy one buffer onto another.
-//  The functions are differentiated by the size of source and dest character sizes.
-//  WARNING: Your destination buffer MUST be big enough to hold all the source bytes.
-//           We don't validate these ranges here (this should be done in higher level routines).
-//
-
-
-/**
- * Going 1 to 1 is easy, since we assume ascii. No conversions are necessary.
- * @update	gess 01/04/99
- * @param aDest is the destination buffer
- * @param aDestOffset is the pos to start copy to in the dest buffer
- * @param aSource is the source buffer
- * @param anOffset is the offset to start copying from in the source buffer
- * @param aCount is the (max) number of chars to copy
- */
-void CopyChars1To1(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
-
-  char* dst = aDest+anDestOffset;
-  char* src = (char*)aSource+anOffset;
-
-  memcpy(dst,src,aCount);
-} 
-
-/**
- * Going 1 to 2 requires a conversion from ascii to unicode. This can be expensive.
- * @param aDest is the destination buffer
- * @param aDestOffset is the pos to start copy to in the dest buffer
- * @param aSource is the source buffer
- * @param anOffset is the offset to start copying from in the source buffer
- * @param aCount is the (max) number of chars to copy
- */
-void CopyChars1To2(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
-
-  PRUnichar* theDest=(PRUnichar*)aDest;
-  PRUnichar* to   = theDest+anDestOffset;
-  const unsigned char* first= (const unsigned char*)aSource+anOffset;
-  const unsigned char* last = first+aCount;
-
-  //now loop over characters, shifting them left...
-  while(first<last) {
-    *to=(PRUnichar)(*first);  
-    to++;
-    first++;
-  }
-}
- 
-
-/**
- * Going 2 to 1 requires a conversion from unicode down to ascii. This can be lossy.
- * @update	gess 01/04/99
- * @param aDest is the destination buffer
- * @param aDestOffset is the pos to start copy to in the dest buffer
- * @param aSource is the source buffer
- * @param anOffset is the offset to start copying from in the source buffer
- * @param aCount is the (max) number of chars to copy
- */
-void CopyChars2To1(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
-  char*             to   = aDest+anDestOffset;
-  PRUnichar*        theSource=(PRUnichar*)aSource;
-  const PRUnichar*  first= theSource+anOffset;
-  const PRUnichar*  last = first+aCount;
-
-  //now loop over characters, shifting them left...
-  while(first<last) {
-    if(*first<256)
-      *to=(char)*first;  
-    else *to='.';
-    to++;
-    first++;
-  }
-}
-
-/**
- * Going 2 to 2 is fast and efficient.
- * @update	gess 01/04/99
- * @param aDest is the destination buffer
- * @param aDestOffset is the pos to start copy to in the dest buffer
- * @param aSource is the source buffer
- * @param anOffset is the offset to start copying from in the source buffer
- * @param aCount is the (max) number of chars to copy
- */
-void CopyChars2To2(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
-  PRUnichar* theDest=(PRUnichar*)aDest;
-  PRUnichar* to   = theDest+anDestOffset;
-  PRUnichar* theSource=(PRUnichar*)aSource;
-  PRUnichar* from= theSource+anOffset;
-
-  memcpy((void*)to,(void*)from,aCount*sizeof(PRUnichar));
-}
-
-
-//--------------------------------------------------------------------------------------
-
-
-typedef void (*CopyChars)(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount);
-
-CopyChars gCopyChars[2][2]={
-  {&CopyChars1To1,&CopyChars1To2},
-  {&CopyChars2To1,&CopyChars2To2}
-};
-
-
-//----------------------------------------------------------------------------------------
-//
-//  This set of methods is used to search a buffer looking for a char.
-//
-
-
-/**
- *  This methods cans the given buffer for the given char
- *  
- *  @update  gess 3/25/98
- *  @param   aDest is the buffer to be searched
- *  @param   aLength is the size (in char-units, not bytes) of the buffer
- *  @param   anOffset is the start pos to begin searching
- *  @param   aChar is the target character we're looking for
- *  @param   aIgnorecase tells us whether to use a case sensitive search
- *  @return  index of pos if found, else -1 (kNotFound)
- */
-inline PRInt32 FindChar1(const char* aDest,PRUint32 aLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
-
-  if(aIgnoreCase) {
-    char theChar=(char)nsCRT::ToUpper(aChar);
-    const char* ptr=aDest+(anOffset-1);
-    const char* last=aDest+aLength;
-    while(++ptr<last){
-      if(nsCRT::ToUpper(*ptr)==theChar)
-        return ptr-aDest;
-    }
-  }
-  else {
-
-    const char* ptr = aDest+anOffset;
-    char theChar=(char)aChar;
-    const char* result=(const char*)memchr(ptr, theChar,aLength-anOffset);
-    if(result) {
-      return result-aDest;
-    }
-  }
-  return kNotFound;
-}
-
-/**
- *  This methods cans the given buffer for the given char
- *  
- *  @update  gess 3/25/98
- *  @param   aDest is the buffer to be searched
- *  @param   aLength is the size (in char-units, not bytes) of the buffer
- *  @param   anOffset is the start pos to begin searching
- *  @param   aChar is the target character we're looking for
- *  @param   aIgnorecase tells us whether to use a case sensitive search
- *  @return  index of pos if found, else -1 (kNotFound)
- */
-inline PRInt32 FindChar2(const char* aDest,PRUint32 aLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
-  const PRUnichar*  root=(PRUnichar*)aDest;
-  const PRUnichar*  ptr=root+(anOffset-1);
-  const PRUnichar*  last=root+aLength;
-
-  if(aIgnoreCase) {
-    PRUnichar theChar=nsCRT::ToUpper(aChar);
-    while(++ptr<last){
-      if(nsCRT::ToUpper(*ptr)==theChar)
-        return ptr-root;
-    }
-  }
-  else {
-    while(++ptr<last){
-      if(*ptr==aChar)
-        return (ptr-root);
-    }
-  }
-
-  return kNotFound;
-}
-
-
-/**
- *  This methods cans the given buffer (in reverse) for the given char
- *  
- *  @update  gess 3/25/98
- *  @param   aDest is the buffer to be searched
- *  @param   aLength is the size (in char-units, not bytes) of the buffer
- *  @param   anOffset is the start pos to begin searching
- *  @param   aChar is the target character we're looking for
- *  @param   aIgnorecase tells us whether to use a case sensitive search
- *  @return  index of pos if found, else -1 (kNotFound)
- */
-inline PRInt32 RFindChar1(const char* aDest,PRUint32 aDestLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
-  PRInt32 theIndex=0;
-
-  if(aIgnoreCase) {
-    PRUnichar theChar=nsCRT::ToUpper(aChar);
-    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
-      if(nsCRT::ToUpper(aDest[theIndex])==theChar)
-        return theIndex;
-    }
-  }
-  else {
-    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
-      if(aDest[theIndex]==aChar)
-        return theIndex;
-    }
-  }
-
-  return kNotFound;
-}
-
-
-/**
- *  This methods cans the given buffer for the given char
- *  
- *  @update  gess 3/25/98
- *  @param   aDest is the buffer to be searched
- *  @param   aLength is the size (in char-units, not bytes) of the buffer
- *  @param   anOffset is the start pos to begin searching
- *  @param   aChar is the target character we're looking for
- *  @param   aIgnorecase tells us whether to use a case sensitive search
- *  @return  index of pos if found, else -1 (kNotFound)
- */
-inline PRInt32 RFindChar2(const char* aDest,PRUint32 aDestLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
-
-  PRInt32 theIndex=0;
-  PRUnichar*  theBuf=(PRUnichar*)aDest;
-
-  if(aIgnoreCase) {
-    PRUnichar theChar=nsCRT::ToUpper(aChar);
-    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
-      if(nsCRT::ToUpper(theBuf[theIndex])==theChar)
-        return theIndex;
-    }
-  }
-  else {
-    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
-      if(theBuf[theIndex]==aChar)
-        return theIndex;
-    }
-  }
-
-  return kNotFound;
-}
-
-typedef PRInt32 (*FindChars)(const char* aDest,PRUint32 aDestLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase);
-FindChars gFindChars[]={&FindChar1,&FindChar2};
-FindChars gRFindChars[]={&RFindChar1,&RFindChar2};
-
-//----------------------------------------------------------------------------------------
-//
-//  This set of methods is used to compare one buffer onto another.
-//  The functions are differentiated by the size of source and dest character sizes.
-//  WARNING: Your destination buffer MUST be big enough to hold all the source bytes.
-//           We don't validate these ranges here (this should be done in higher level routines).
-//
-
-
-/**
- * This method compares the data in one buffer with another
- * @update	gess 01/04/99
- * @param   aStr1 is the first buffer to be compared
- * @param   aStr2 is the 2nd buffer to be compared
- * @param   aCount is the number of chars to compare
- * @param   aIgnorecase tells us whether to use a case-sensitive comparison
- * @return  -1,0,1 depending on <,==,>
- */
-PRInt32 Compare1To1(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
-  PRInt32 result=0;
-  if(aIgnoreCase)
-    result=nsCRT::strncasecmp(aStr1,aStr2,aCount);
-  else result=strncmp(aStr1,aStr2,aCount);
-  return result;
-}
-
-/**
- * This method compares the data in one buffer with another
- * @update	gess 01/04/99
- * @param   aStr1 is the first buffer to be compared
- * @param   aStr2 is the 2nd buffer to be compared
- * @param   aCount is the number of chars to compare
- * @param   aIgnorecase tells us whether to use a case-sensitive comparison
- * @return  -1,0,1 depending on <,==,>
- */
-PRInt32 Compare2To2(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
-  PRInt32 result=0;
-  if(aIgnoreCase)
-    result=nsCRT::strncasecmp((PRUnichar*)aStr1,(PRUnichar*)aStr2,aCount);
-  else result=nsCRT::strncmp((PRUnichar*)aStr1,(PRUnichar*)aStr2,aCount);
-  return result;
-}
-
-
-/**
- * This method compares the data in one buffer with another
- * @update	gess 01/04/99
- * @param   aStr1 is the first buffer to be compared
- * @param   aStr2 is the 2nd buffer to be compared
- * @param   aCount is the number of chars to compare
- * @param   aIgnorecase tells us whether to use a case-sensitive comparison
- * @return  -1,0,1 depending on <,==,>
- */
-PRInt32 Compare2To1(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
-  PRInt32 result;
-  if(aIgnoreCase)
-    result=nsCRT::strncasecmp((PRUnichar*)aStr1,aStr2,aCount);
-  else result=nsCRT::strncmp((PRUnichar*)aStr1,aStr2,aCount);
-  return result;
-}
-
-
-/**
- * This method compares the data in one buffer with another
- * @update	gess 01/04/99
- * @param   aStr1 is the first buffer to be compared
- * @param   aStr2 is the 2nd buffer to be compared
- * @param   aCount is the number of chars to compare
- * @param   aIgnorecase tells us whether to use a case-sensitive comparison
- * @return  -1,0,1 depending on <,==,>
- */
-PRInt32 Compare1To2(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
-  PRInt32 result;
-  if(aIgnoreCase)
-    result=nsCRT::strncasecmp((PRUnichar*)aStr2,aStr1,aCount)*-1;
-  else result=nsCRT::strncmp((PRUnichar*)aStr2,aStr1,aCount)*-1;
-  return result;
-}
-
-
-typedef PRInt32 (*CompareChars)(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase);
-CompareChars gCompare[2][2]={
-  {&Compare1To1,&Compare1To2},
-  {&Compare2To1,&Compare2To2},
-};
-
-//----------------------------------------------------------------------------------------
-//
-//  This set of methods is used to convert the case of strings...
-//
-
-
-/**
- * This method performs a case conversion the data in the given buffer 
- *
- * @update	gess 01/04/99
- * @param   aString is the buffer to be case shifted
- * @param   aCount is the number of chars to compare
- * @param   aToUpper tells us whether to convert to upper or lower
- * @return  0
- */
-PRInt32 ConvertCase1(char* aString,PRUint32 aCount,PRBool aToUpper){ 
-  PRInt32 result=0;
-
-  typedef char  chartype;
-  chartype* cp = (chartype*)aString;
-  chartype* end = cp + aCount-1;
-  while (cp <= end) {
-    chartype ch = *cp;
-    if(aToUpper) {
-      if ((ch >= 'a') && (ch <= 'z')) {
-        *cp = 'A' + (ch - 'a');
-      }
-    }
-    else {
-      if ((ch >= 'A') && (ch <= 'Z')) {
-        *cp = 'a' + (ch - 'A');
-      }
-    }
-    cp++;
-  }
-  return result;
-}
-
-//----------------------------------------------------------------------------------------
-
-#ifndef RICKG_TESTBED
-class HandleCaseConversionShutdown3 : public nsIShutdownListener {
-public :
-   NS_IMETHOD OnShutdown(const nsCID& cid, nsISupports* service);
-   HandleCaseConversionShutdown3(void) { NS_INIT_REFCNT(); }
-   virtual ~HandleCaseConversionShutdown3(void) {}
-   NS_DECL_ISUPPORTS
-};
-
-static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
-static NS_DEFINE_IID(kICaseConversionIID, NS_ICASECONVERSION_IID);
-static NS_DEFINE_IID(kIShutdownListenerIID, NS_ISHUTDOWNLISTENER_IID);
-static nsICaseConversion * gCaseConv = 0; 
-
-NS_IMPL_ISUPPORTS(HandleCaseConversionShutdown3, kIShutdownListenerIID);
-
-nsresult HandleCaseConversionShutdown3::OnShutdown(const nsCID& cid, nsISupports* service) {
-    if (cid.Equals(kUnicharUtilCID)) {
-        NS_ASSERTION(service == gCaseConv, "wrong service!");
-        if(gCaseConv){
-          gCaseConv->Release();
-          gCaseConv = 0;
-        }
-    }
-    return NS_OK;
-}
-
-
-class CCaseConversionServiceInitializer {
-public:
-  CCaseConversionServiceInitializer(){
-    mListener = new HandleCaseConversionShutdown3();
-    if(mListener){
-      mListener->AddRef();
-      nsServiceManager::GetService(kUnicharUtilCID, kICaseConversionIID,(nsISupports**) &gCaseConv, mListener);
-    }
-  }
-protected:
-  HandleCaseConversionShutdown3* mListener;
-};
-
-#endif
-
-//----------------------------------------------------------------------------------------
-
-/**
- * This method performs a case conversion the data in the given buffer 
- *
- * @update	gess 01/04/99
- * @param   aString is the buffer to be case shifted
- * @param   aCount is the number of chars to compare
- * @param   aToUpper tells us whether to convert to upper or lower
- * @return  0
- */
-PRInt32 ConvertCase2(char* aString,PRUint32 aCount,PRBool aToUpper){ 
-  PRUnichar* cp = (PRUnichar*)aString;
-  PRUnichar* end = cp + aCount-1;
-  PRInt32 result=0;
-
-#ifndef RICKG_TESTBED
-  static CCaseConversionServiceInitializer  gCaseConversionServiceInitializer;
-
-  // I18N code begin
-  if(gCaseConv) {
-    nsresult err=(aToUpper) ? gCaseConv->ToUpper(cp, cp, aCount) : gCaseConv->ToLower(cp, cp, aCount);
-    if(NS_SUCCEEDED(err))
-      return 0;
-  }
-  // I18N code end
-#endif
-
-
-  while (cp <= end) {
-    PRUnichar ch = *cp;
-    if(aToUpper) {
-      if ((ch >= 'a') && (ch <= 'z')) {
-        *cp = 'A' + (ch - 'a');
-      }
-    }
-    else {
-      if ((ch >= 'A') && (ch <= 'Z')) {
-        *cp = 'a' + (ch - 'A');
-      }
-    }
-    cp++;
-  }
-
-  return result;
-}
-
-typedef PRInt32 (*CaseConverters)(char*,PRUint32,PRBool);
-CaseConverters gCaseConverters[]={&ConvertCase1,&ConvertCase2};
-
-
-
-//----------------------------------------------------------------------------------------
-//
-//  This set of methods is used compress char sequences in a buffer...
-//
-
-
-/**
- * This method compresses duplicate runs of a given char from the given buffer 
- *
- * @update	gess 01/04/99
- * @param   aString is the buffer to be manipulated
- * @param   aLength is the length of the buffer
- * @param   aSet tells us which chars to compress from given buffer
- * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
- * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
- * @return  the new length of the given buffer
- */
-PRInt32 CompressChars1(char* aString,PRUint32 aLength,const char* aSet){ 
-
-  typedef char  chartype;
-  chartype*  from = aString;
-  chartype*  end =  aString + aLength-1;
-  chartype*  to = from;
-
-    //this code converts /n, /t, /r into normal space ' ';
-    //it also compresses runs of whitespace down to a single char...
-  if(aSet && aString && (0 < aLength)){
-    PRUint32 aSetLen=strlen(aSet);
-    while (from <= end) {
-      chartype theChar = *from++;
-      if(kNotFound!=FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
-        *to++=theChar;
-        while (from <= end) {
-          theChar = *from++;
-          if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
-            *to++ = theChar;
-            break;
-          }
-        }
-      } else {
-        *to++ = theChar;
-      }
-    }
-    *to = 0;
-  }
-  return to - (chartype*)aString;
-}
-
-
-/**
- * This method compresses duplicate runs of a given char from the given buffer 
- *
- * @update	gess 01/04/99
- * @param   aString is the buffer to be manipulated
- * @param   aLength is the length of the buffer
- * @param   aSet tells us which chars to compress from given buffer
- * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
- * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
- * @return  the new length of the given buffer
- */
-PRInt32 CompressChars2(char* aString,PRUint32 aLength,const char* aSet){ 
-
-  typedef PRUnichar  chartype;
-  chartype*  from = (chartype*)aString;
-  chartype*  end =  from + aLength-1;
-  chartype*  to = from;
-
-    //this code converts /n, /t, /r into normal space ' ';
-    //it also compresses runs of whitespace down to a single char...
-  if(aSet && aString && (0 < aLength)){
-    PRUint32 aSetLen=strlen(aSet);
-    while (from <= end) {
-      chartype theChar = *from++;
-      if(kNotFound!=FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
-        *to++=theChar;
-        while (from <= end) {
-          theChar = *from++;
-          if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
-            *to++ = theChar;
-            break;
-          }
-        }
-      } else {
-        *to++ = theChar;
-      }
-    }
-    *to = 0;
-  }
-  return to - (chartype*)aString;
-}
-
-typedef PRInt32 (*CompressChars)(char* aString,PRUint32 aCount,const char* aSet);
-CompressChars gCompressChars[]={&CompressChars1,&CompressChars2};
-
-/**
- * This method strips chars in a given set from the given buffer 
- *
- * @update	gess 01/04/99
- * @param   aString is the buffer to be manipulated
- * @param   aLength is the length of the buffer
- * @param   aSet tells us which chars to compress from given buffer
- * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
- * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
- * @return  the new length of the given buffer
- */
-PRInt32 StripChars1(char* aString,PRUint32 aLength,const char* aSet){ 
-
-  typedef char  chartype;
-  chartype*  to   = aString;
-  chartype*  from = aString-1;
-  chartype*  end  = aString + aLength;
-
-  if(aSet && aString && (0 < aLength)){
-    PRUint32 aSetLen=strlen(aSet);
-    while (++from < end) {
-      chartype theChar = *from;
-      if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
-        *to++ = theChar;
-      }
-    }
-    *to = 0;
-  }
-  return to - (chartype*)aString;
-}
-
-
-/**
- * This method strips chars in a given set from the given buffer 
- *
- * @update	gess 01/04/99
- * @param   aString is the buffer to be manipulated
- * @param   aLength is the length of the buffer
- * @param   aSet tells us which chars to compress from given buffer
- * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
- * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
- * @return  the new length of the given buffer
- */
-PRInt32 StripChars2(char* aString,PRUint32 aLength,const char* aSet){ 
-
-  typedef PRUnichar  chartype;
-  chartype*  to   = (chartype*)aString;
-  chartype*  from = (chartype*)aString-1;
-  chartype*  end  = to + aLength;
-
-  if(aSet && aString && (0 < aLength)){
-    PRUint32 aSetLen=strlen(aSet);
-    while (++from < end) {
-      chartype theChar = *from;
-      if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
-        *to++ = theChar;
-      }
-    }
-    *to = 0;
-  }
-  return to - (chartype*)aString;
-}
-
-typedef PRInt32 (*StripChars)(char* aString,PRUint32 aCount,const char* aSet);
-StripChars gStripChars[]={&StripChars1,&StripChars2};
-
-#endif

mozilla/xpcom/ds/makefile.win

@@ -1,120 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-
-
-DEPTH=..\..
-MODULE = xpcom 
-
-################################################################################
-## exports
-
-EXPORTS =                          \
-        nsTextFormater.h           \
-        nsAVLTree.h                \
-        nsCppSharedAllocator.h     \
-        nsCRT.h                    \
-        nsDeque.h                  \
-        nsEnumeratorUtils.h        \
-        nsHashtable.h              \
-        nsHashtableEnumerator.h    \
-        nsIArena.h                 \
-        nsIByteBuffer.h            \
-        nsIObserverList.h          \
-        nsIProperties.h            \
-        nsISimpleEnumerator.h      \
-        nsISizeOfHandler.h         \
-        nsIUnicharBuffer.h         \
-        nsIVariant.h               \
-        nsInt64.h                  \
-        nsQuickSort.h              \
-        nsStr.h                    \
-        nsString.h                 \
-        nsString2.h                \
-        nsSupportsPrimitives.h     \
-        nsTime.h                   \
-        nsUnitConversion.h         \
-        nsVector.h                 \
-        nsVoidArray.h              \
-        nsXPIDLString.h            \
-        plvector.h                 \
-        $(NULL)			
-
-XPIDL_MODULE = xpcom_ds
-
-XPIDLSRCS =                         \
-        .\nsIAtom.idl               \
-        .\nsICollection.idl         \
-        .\nsIEnumerator.idl         \
-	.\nsIObserver.idl           \
-	.\nsIObserverService.idl    \
-	.\nsISupportsArray.idl	    \
-	.\nsISupportsPrimitives.idl \
-        $(NULL)
-
-################################################################################
-## library
-
-LIBRARY_NAME=xpcomds_s
-
-LINCS =                         \
-	-I$(PUBLIC)\xpcom       \
-        -I$(PUBLIC)\uconv       \
-        -I$(PUBLIC)\unicharutil \
-	$(NULL)
-
-LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
-
-CPP_OBJS =                                        \
-        .\$(OBJDIR)\nsTextFormater.obj            \
-        .\$(OBJDIR)\nsArena.obj                   \
-        .\$(OBJDIR)\nsAtomTable.obj               \
-        .\$(OBJDIR)\nsAVLTree.obj                 \
-        .\$(OBJDIR)\nsByteBuffer.obj              \
-        .\$(OBJDIR)\nsCRT.obj                     \
-        .\$(OBJDIR)\nsConjoiningEnumerator.obj    \
-        .\$(OBJDIR)\nsDeque.obj                   \
-        .\$(OBJDIR)\nsEmptyEnumerator.obj         \
-        .\$(OBJDIR)\nsEnumeratorUtils.obj         \
-        .\$(OBJDIR)\nsHashtable.obj               \
-        .\$(OBJDIR)\nsHashtableEnumerator.obj     \
-        .\$(OBJDIR)\nsObserver.obj                \
-        .\$(OBJDIR)\nsObserverList.obj            \
-        .\$(OBJDIR)\nsObserverService.obj         \
-        .\$(OBJDIR)\nsProperties.obj              \
-        .\$(OBJDIR)\nsQuickSort.obj               \
-        .\$(OBJDIR)\nsSizeOfHandler.obj           \
-        .\$(OBJDIR)\nsStr.obj                     \
-        .\$(OBJDIR)\nsString.obj                  \
-        .\$(OBJDIR)\nsString2.obj                 \
-        .\$(OBJDIR)\nsSupportsArray.obj           \
-        .\$(OBJDIR)\nsSupportsArrayEnumerator.obj \
-        .\$(OBJDIR)\nsSupportsPrimitives.obj      \
-        .\$(OBJDIR)\nsUnicharBuffer.obj           \
-        .\$(OBJDIR)\nsVariant.obj                 \
-        .\$(OBJDIR)\nsVoidArray.obj               \
-        .\$(OBJDIR)\nsXPIDLString.obj             \
-        .\$(OBJDIR)\plvector.obj                  \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-libs:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/xpcom/ds/nsAVLTree.cpp

@@ -1,617 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsAVLTree.h"
- 
-
-enum eLean      {eLeft,eNeutral,eRight};
-
-struct NS_COM nsAVLNode {
-public:
-
-  nsAVLNode(void* aValue) {
-    mLeft=0;
-    mRight=0;
-    mSkew=eNeutral;
-    mValue=aValue;
-  }
-
-  nsAVLNode*  mLeft;
-  nsAVLNode*  mRight;
-  eLean       mSkew;
-  void*       mValue;
-};
-
-
-/************************************************************
-  Now begin the tree class. Don't forget that the comparison
-  between nodes must occur via the comparitor function, 
-  otherwise all you're testing is pointer addresses.
- ************************************************************/
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-nsAVLTree::nsAVLTree(nsAVLNodeComparitor& aComparitor, 
-                     nsAVLNodeFunctor* aDeallocator) :
-  mComparitor(aComparitor), mDeallocator(aDeallocator) {
-  mRoot=0;
-  mCount=0;
-}
-
-
-static void 
-avlDeleteTree(nsAVLNode* aNode){
-  if (aNode) {
-    avlDeleteTree(aNode->mLeft);
-    avlDeleteTree(aNode->mRight);
-    delete aNode;
-  }
-}
-
-/**
- * 
- * @update	gess12/27/98
- * @param 
- * @return
- */
-nsAVLTree::~nsAVLTree(){
-  if (mDeallocator) {
-    ForEachDepthFirst(*mDeallocator);
-  }
-  avlDeleteTree(mRoot);
-}
-
-
-class CDoesntExist: public nsAVLNodeFunctor {
-public:
-  CDoesntExist(const nsAVLTree& anotherTree) : mOtherTree(anotherTree) {
-  }
-  virtual void* operator()(void* anItem) {
-    void* result=mOtherTree.FindItem(anItem);
-    if(result)
-      return nsnull;
-    return anItem;
-  }
-protected:
-  const nsAVLTree& mOtherTree;
-};
-
-/**
- * This method compares two trees (members by identity).
- * @update	gess12/27/98
- * @param   tree to compare against
- * @return  true if they are identical (contain same stuff).
- */
-PRBool nsAVLTree::operator==(const nsAVLTree& aCopy) const{
-  CDoesntExist functor(aCopy);
-  void* theItem=FirstThat(functor);
-  PRBool result=PRBool(!theItem);
-  return result;
-}
-
-
-/**
- * 
- * @update	gess12/27/98
- * @param 
- * @return
- */
-static void 
-avlRotateRight(nsAVLNode*& aRootNode){
-  nsAVLNode* ptr2;
-  nsAVLNode* ptr3;
-
-  ptr2=aRootNode->mRight;
-  if(ptr2->mSkew==eRight) {
-    aRootNode->mRight=ptr2->mLeft;
-    ptr2->mLeft=aRootNode;
-    aRootNode->mSkew=eNeutral;
-    aRootNode=ptr2;
-  }
-  else {
-    ptr3=ptr2->mLeft;
-    ptr2->mLeft=ptr3->mRight;
-    ptr3->mRight=ptr2;
-    aRootNode->mRight=ptr3->mLeft;
-    ptr3->mLeft=aRootNode;
-    if(ptr3->mSkew==eLeft)
-      ptr2->mSkew=eRight;
-    else ptr2->mSkew=eNeutral;
-    if(ptr3->mSkew==eRight)
-      aRootNode->mSkew=eLeft;
-    else aRootNode->mSkew=eNeutral;
-    aRootNode=ptr3;
-  }
-  aRootNode->mSkew=eNeutral;
-  return;
-}
-
-
-
-/**
- * 
- * @update	gess12/27/98
- * @param 
- * @return
- */
-static void 
-avlRotateLeft(nsAVLNode*& aRootNode){
-  nsAVLNode* ptr2;
-  nsAVLNode* ptr3;
-
-  ptr2=aRootNode->mLeft;
-  if(ptr2->mSkew==eLeft) {
-    aRootNode->mLeft=ptr2->mRight;
-    ptr2->mRight=aRootNode;
-    aRootNode->mSkew=eNeutral;
-    aRootNode=ptr2;
-  }
-  else {
-    ptr3=ptr2->mRight;
-    ptr2->mRight=ptr3->mLeft;
-    ptr3->mLeft=ptr2;
-    aRootNode->mLeft=ptr3->mRight;
-    ptr3->mRight=aRootNode;
-    if(ptr3->mSkew==eRight)
-      ptr2->mSkew=eLeft;
-    else ptr2->mSkew=eNeutral;
-    if(ptr3->mSkew==eLeft)
-      aRootNode->mSkew=eRight;
-    else aRootNode->mSkew=eNeutral;
-    aRootNode=ptr3;
-  }
-  aRootNode->mSkew=eNeutral;
-  return;
-}
-
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-static eAVLStatus 
-avlInsert(nsAVLNode*& aRootNode, nsAVLNode* aNewNode, 
-          nsAVLNodeComparitor& aComparitor) {
-  eAVLStatus result=eAVL_unknown;
-  
-  if(!aRootNode) {
-    aRootNode = aNewNode;
-    return eAVL_ok;
-  }
-  
-  if(aNewNode==aRootNode->mValue) {
-    return eAVL_duplicate;
-  }
-
-  PRInt32 theCompareResult=aComparitor(aRootNode->mValue,aNewNode->mValue);
-  if(0 < theCompareResult) { //if(anItem<aRootNode->mValue)
-    result=avlInsert(aRootNode->mLeft,aNewNode,aComparitor);
-    if(eAVL_ok==result) {
-      switch(aRootNode->mSkew){
-        case eLeft:
-          avlRotateLeft(aRootNode);
-          result=eAVL_fail;
-          break;
-        case eRight:
-          aRootNode->mSkew=eNeutral;
-          result=eAVL_fail;
-          break;
-        case eNeutral:
-          aRootNode->mSkew=eLeft;
-          break;
-      } //switch
-    }//if
-  } //if
-  else { 
-    result=avlInsert(aRootNode->mRight,aNewNode,aComparitor);
-    if(eAVL_ok==result) {
-      switch(aRootNode->mSkew){
-        case eLeft:
-          aRootNode->mSkew=eNeutral;
-          result=eAVL_fail;
-          break;
-        case eRight:
-          avlRotateRight(aRootNode);
-          result=eAVL_fail;
-          break;
-        case eNeutral:
-          aRootNode->mSkew=eRight;
-          break;
-      } //switch
-    }
-  } //if
-  return result;
-}
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-static void 
-avlBalanceLeft(nsAVLNode*& aRootNode, PRBool& delOk){
-  nsAVLNode*  ptr2;
-  nsAVLNode*  ptr3;
-  eLean       balnc2;
-  eLean       balnc3;
-
-  switch(aRootNode->mSkew){
-    case eLeft:
-      ptr2=aRootNode->mLeft;
-      balnc2=ptr2->mSkew;
-      if(balnc2!=eRight) {
-        aRootNode->mLeft=ptr2->mRight;
-        ptr2->mRight=aRootNode;
-        if(balnc2==eNeutral){
-          aRootNode->mSkew=eLeft;
-          ptr2->mSkew=eRight;
-          delOk=PR_FALSE;
-        }
-        else{
-          aRootNode->mSkew=eNeutral;
-          ptr2->mSkew=eNeutral;
-        }
-        aRootNode=ptr2;
-      }
-      else{
-        ptr3=ptr2->mRight;
-        balnc3=ptr3->mSkew;
-        ptr2->mRight=ptr3->mLeft;
-        ptr3->mLeft=ptr2;
-        aRootNode->mLeft=ptr3->mRight;
-        ptr3->mRight=aRootNode;
-        if(balnc3==eRight) {
-          ptr2->mSkew=eLeft;
-        }
-        else {
-          ptr2->mSkew=eNeutral;
-        }
-        if(balnc3==eLeft) {
-          aRootNode->mSkew=eRight;
-        }
-        else {
-          aRootNode->mSkew=eNeutral;
-        }
-        aRootNode=ptr3;
-        ptr3->mSkew=eNeutral;
-      }
-      break;
-
-    case eRight:
-      aRootNode->mSkew=eNeutral;
-      break;
-    
-    case eNeutral:
-      aRootNode->mSkew=eLeft;
-      delOk=PR_FALSE;
-      break;
-  }//switch
-  return;
-}
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-static void 
-avlBalanceRight(nsAVLNode*& aRootNode, PRBool& delOk){
-  nsAVLNode*  ptr2;
-  nsAVLNode*  ptr3;
-  eLean       balnc2;
-  eLean       balnc3;
-
-  switch(aRootNode->mSkew){
-    case eLeft:
-      aRootNode->mSkew=eNeutral;
-      break;
-
-    case eRight:
-      ptr2=aRootNode->mRight;
-      balnc2=ptr2->mSkew;
-      if(balnc2!=eLeft) {
-        aRootNode->mRight=ptr2->mLeft;
-        ptr2->mLeft=aRootNode;
-        if(balnc2==eNeutral){
-          aRootNode->mSkew=eRight;
-          ptr2->mSkew=eLeft;
-          delOk=PR_FALSE;
-        }
-        else{
-          aRootNode->mSkew=eNeutral;
-          ptr2->mSkew=eNeutral;
-        }
-        aRootNode=ptr2;
-      }
-      else{
-        ptr3=ptr2->mLeft;
-        balnc3=ptr3->mSkew;
-        ptr2->mLeft=ptr3->mRight;
-        ptr3->mRight=ptr2;
-        aRootNode->mRight=ptr3->mLeft;
-        ptr3->mLeft=aRootNode;
-        if(balnc3==eLeft) {
-          ptr2->mSkew=eRight;
-        }
-        else {
-          ptr2->mSkew=eNeutral;
-        }
-        if(balnc3==eRight) {
-          aRootNode->mSkew=eLeft;
-        }
-        else {
-          aRootNode->mSkew=eNeutral;
-        }
-        aRootNode=ptr3;
-        ptr3->mSkew=eNeutral;
-      }
-      break;
-
-    case eNeutral:
-      aRootNode->mSkew=eRight;
-      delOk=PR_FALSE;
-      break;
-  }//switch
-  return;
-}
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-static eAVLStatus 
-avlRemoveChildren(nsAVLNode*& aRootNode,nsAVLNode*& anotherNode, PRBool& delOk){
-  eAVLStatus result=eAVL_ok;
-  
-  if(!anotherNode->mRight){
-    aRootNode->mValue=anotherNode->mValue; //swap
-    anotherNode=anotherNode->mLeft;
-    delOk=PR_TRUE;
-  }
-  else{
-    avlRemoveChildren(aRootNode,anotherNode->mRight,delOk);
-    if(delOk)
-      avlBalanceLeft(anotherNode,delOk);
-  }
-
-  return result;
-}
-
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-static eAVLStatus 
-avlRemove(nsAVLNode*& aRootNode, void* anItem, PRBool& delOk,
-          nsAVLNodeComparitor& aComparitor){
-  eAVLStatus result=eAVL_ok;
-
-  if(!aRootNode)
-    delOk=PR_FALSE;
-  else {
-    PRInt32 cmp=aComparitor(anItem,aRootNode->mValue);
-    if(cmp<0){
-      avlRemove(aRootNode->mLeft,anItem,delOk,aComparitor);
-      if(delOk)
-        avlBalanceRight(aRootNode,delOk);
-    }
-    else if(cmp>0){
-      avlRemove(aRootNode->mRight,anItem,delOk,aComparitor);
-      if(delOk)
-        avlBalanceLeft(aRootNode,delOk);
-    }
-    else{ //they match...
-      nsAVLNode* temp=aRootNode;
-      if(!aRootNode->mRight) {
-        aRootNode=aRootNode->mLeft;
-        delOk=PR_TRUE;
-        delete temp;
-      }
-      else if(!aRootNode->mLeft) {
-        aRootNode=aRootNode->mRight;
-        delOk=PR_TRUE;
-        delete temp;
-      }
-      else {
-        avlRemoveChildren(aRootNode,aRootNode->mLeft,delOk);
-        if(delOk)
-          avlBalanceRight(aRootNode,delOk);
-      }
-    }
-  }
-
-  return result;
-}
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-eAVLStatus 
-nsAVLTree::AddItem(void* anItem){
-  eAVLStatus result=eAVL_ok;
-
-  nsAVLNode* theNewNode=new nsAVLNode(anItem);
-  result=avlInsert(mRoot,theNewNode,mComparitor);
-  if(eAVL_duplicate!=result)
-    mCount++;
-  else {
-    delete theNewNode;
-  }
-  return result;
-}
-
-/** ------------------------------------------------
- * 
- * 
- * @update gess 4/22/98
- * @param  
- * @return 
- */ //----------------------------------------------
-void* nsAVLTree::FindItem(void* aValue) const{
-  nsAVLNode* result=mRoot;
-  PRInt32 count=0;
-  while(result) {
-    count++;
-    PRInt32 cmp=mComparitor(aValue,result->mValue);
-    if(0==cmp) {
-      //we matched...
-      break;
-    }
-    else if(0>cmp){
-      //theNode was greater...
-      result=result->mLeft;
-    }
-    else {
-      //aValue is greater...
-      result=result->mRight;
-    }
-  }
-  if(result) {
-    return result->mValue;
-  }
-  return nsnull;
-}
-
-
-/**
- * 
- * @update	gess12/30/98
- * @param 
- * @return
- */
-eAVLStatus 
-nsAVLTree::RemoveItem(void* aValue){
-  PRBool delOk=PR_TRUE;
-  eAVLStatus result=avlRemove(mRoot,aValue,delOk,mComparitor);
-  if(eAVL_ok==result)
-    mCount--;
-  return result;
-} 
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-static void 
-avlForEachDepthFirst(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor){
-  if(aNode) {
-    avlForEachDepthFirst(aNode->mLeft,aFunctor);
-    avlForEachDepthFirst(aNode->mRight,aFunctor);
-    aFunctor(aNode->mValue);
-  }
-}
-
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-void 
-nsAVLTree::ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const{
-  ::avlForEachDepthFirst(mRoot,aFunctor);
-}
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-static void 
-avlForEach(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
-  if(aNode) {
-    avlForEach(aNode->mLeft,aFunctor);
-    aFunctor(aNode->mValue);
-    avlForEach(aNode->mRight,aFunctor);
-  }
-}
-
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-void 
-nsAVLTree::ForEach(nsAVLNodeFunctor& aFunctor) const{
-  ::avlForEach(mRoot,aFunctor);
-}
-
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-static void* 
-avlFirstThat(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
-  void* result=nsnull;
-  if(aNode) {
-    result = avlFirstThat(aNode->mLeft,aFunctor);
-    if (result) {
-      return result;
-    }
-    result = aFunctor(aNode->mValue);
-    if (result) {
-      return result;
-    }
-    result = avlFirstThat(aNode->mRight,aFunctor);
-  }
-  return result;
-}
-
-/**
- * 
- * @update	gess9/11/98
- * @param 
- * @return
- */
-void* 
-nsAVLTree::FirstThat(nsAVLNodeFunctor& aFunctor) const{
-  return ::avlFirstThat(mRoot,aFunctor);
-}
-

mozilla/xpcom/ds/nsAVLTree.h

@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsAVLTree_h___
-#define nsAVLTree_h___
-
-
-#include "nscore.h"
-
-
-enum eAVLStatus {eAVL_unknown,eAVL_ok,eAVL_fail,eAVL_duplicate};
-
-
-struct nsAVLNode;
-
-/**
- * 
- * @update	gess12/26/98
- * @param anObject1 is the first object to be compared
- * @param anObject2 is the second object to be compared
- * @return -1,0,1 if object1 is less, equal, greater than object2
- */
-class NS_COM nsAVLNodeComparitor {
-public:
-  virtual PRInt32 operator()(void* anItem1,void* anItem2)=0;
-}; 
-
-class NS_COM nsAVLNodeFunctor {
-public:
-  virtual void* operator()(void* anItem)=0;
-};
-
-class NS_COM nsAVLTree {
-public:
-              nsAVLTree(nsAVLNodeComparitor& aComparitor, nsAVLNodeFunctor* aDeallocator);
-              ~nsAVLTree(void);
-
-  PRBool      operator==(const nsAVLTree& aOther) const;
-  PRInt32     GetCount(void) const {return mCount;}
-
-              //main functions...
-  eAVLStatus  AddItem(void* anItem);
-  eAVLStatus  RemoveItem(void* anItem);
-  void*       FindItem(void* anItem) const;
-  void        ForEach(nsAVLNodeFunctor& aFunctor) const;
-  void        ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const;
-  void*       FirstThat(nsAVLNodeFunctor& aFunctor) const;
-
-protected: 
-
-  nsAVLNode*  mRoot;
-  PRInt32     mCount;
-  nsAVLNodeComparitor&  mComparitor;
-  nsAVLNodeFunctor*     mDeallocator;
-};
-
-
-#endif /* nsAVLTree_h___ */
-

mozilla/xpcom/ds/nsArena.cpp

@@ -1,97 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsArena.h"
-#include "nsCRT.h"
-
-ArenaImpl::ArenaImpl(void)
-  : mInitialized(PR_FALSE)
-{
-  NS_INIT_REFCNT();
-  nsCRT::memset(&mPool, 0, sizeof(PLArenaPool));
-}
-
-NS_IMETHODIMP
-ArenaImpl::Init(PRUint32 aBlockSize)
-{
-  if (aBlockSize < NS_MIN_ARENA_BLOCK_SIZE) {
-    aBlockSize = NS_DEFAULT_ARENA_BLOCK_SIZE;
-  }
-  PL_INIT_ARENA_POOL(&mPool, "nsIArena", aBlockSize);
-  mBlockSize = aBlockSize;
-  mInitialized = PR_TRUE;
-  return NS_OK;
-}
-
-NS_IMPL_ISUPPORTS1(ArenaImpl, nsIArena)
-
-ArenaImpl::~ArenaImpl()
-{
-  if (mInitialized)
-    PL_FinishArenaPool(&mPool);
-
-  mInitialized = PR_FALSE;
-}
-
-NS_IMETHODIMP_(void*)
-ArenaImpl::Alloc(PRUint32 size)
-{
-  // Adjust size so that it's a multiple of sizeof(double)
-  PRUint32 align = size & (sizeof(double) - 1);
-  if (0 != align) {
-    size += sizeof(double) - align;
-  }
-
-  void* p;
-  PL_ARENA_ALLOCATE(p, &mPool, size);
-  return p;
-}
-
-NS_METHOD
-ArenaImpl::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-  if (aOuter)
-    return NS_ERROR_NO_AGGREGATION;
-  
-  ArenaImpl* it = new ArenaImpl();
-  if (nsnull == it)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(it);
-  nsresult rv = it->QueryInterface(aIID, aResult);
-  NS_RELEASE(it);
-  return rv;
-}
-
-NS_COM nsresult NS_NewHeapArena(nsIArena** aInstancePtrResult,
-                                 PRUint32 aArenaBlockSize)
-{
-  nsresult rv;
-  nsIArena* arena;
-  rv = ArenaImpl::Create(NULL, nsIArena::GetIID(), (void**)&arena);
-  if (NS_FAILED(rv)) return rv;
-    
-  rv = arena->Init(aArenaBlockSize);
-  if (NS_FAILED(rv)) {
-    NS_RELEASE(arena);
-    return rv;
-  }    
-  
-  *aInstancePtrResult = arena;
-  return rv;
-}

mozilla/xpcom/ds/nsArena.h

@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsArena_h__
-#define nsArena_h__
-
-#include "nsIArena.h"
-
-#define PL_ARENA_CONST_ALIGN_MASK 7
-#include "plarena.h"
-
-// Simple arena implementation layered on plarena
-class ArenaImpl : public nsIArena {
-public:
-  ArenaImpl(void);
-  virtual ~ArenaImpl();
-
-  NS_DECL_ISUPPORTS
-
-  static NS_METHOD
-  Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-  NS_IMETHOD Init(PRUint32 arenaBlockSize);
-
-  NS_IMETHOD_(void*) Alloc(PRUint32 size);
-
-protected:
-  PLArenaPool mPool;
-  PRUint32 mBlockSize;
-
-private:
-  PRBool mInitialized;
-};
-
-#endif // nsArena_h__

mozilla/xpcom/ds/nsAtomTable.cpp

@@ -1,172 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsAtomTable.h"
-#include "nsString.h"
-#include "nsCRT.h"
-#include "plhash.h"
-#include "nsISizeOfHandler.h"
-
-/**
- * The shared hash table for atom lookups.
- */
-static nsrefcnt gAtoms;
-static struct PLHashTable* gAtomHashTable;
-
-#if defined(DEBUG) && (defined(XP_UNIX) || defined(XP_PC))
-static PRIntn
-DumpAtomLeaks(PLHashEntry *he, PRIntn index, void *arg)
-{
-  AtomImpl* atom = (AtomImpl*) he->value;
-  if (atom) {
-    nsAutoString tmp;
-    atom->ToString(tmp);
-    fputs(tmp, stdout);
-    fputs("\n", stdout);
-  }
-  return HT_ENUMERATE_NEXT;
-}
-#endif
-
-NS_COM void NS_PurgeAtomTable(void)
-{
-  if (gAtomHashTable) {
-#if defined(DEBUG) && (defined(XP_UNIX) || defined(XP_PC))
-    if (gAtoms) {
-      if (getenv("MOZ_DUMP_ATOM_LEAKS")) {
-        printf("*** leaking %d atoms\n", gAtoms);
-        PL_HashTableEnumerateEntries(gAtomHashTable, DumpAtomLeaks, 0);
-      }
-    }
-#endif
-    PL_HashTableDestroy(gAtomHashTable);
-    gAtomHashTable = nsnull;
-  }
-}
-
-AtomImpl::AtomImpl()
-{
-  NS_INIT_REFCNT();
-  // Every live atom holds a reference on the atom hashtable
-  gAtoms++;
-}
-
-AtomImpl::~AtomImpl()
-{
-  NS_PRECONDITION(nsnull != gAtomHashTable, "null atom hashtable");
-  if (nsnull != gAtomHashTable) {
-    PL_HashTableRemove(gAtomHashTable, mString);
-    nsrefcnt cnt = --gAtoms;
-    if (0 == cnt) {
-      // When the last atom is destroyed, the atom arena is destroyed
-      NS_ASSERTION(0 == gAtomHashTable->nentries, "bad atom table");
-      PL_HashTableDestroy(gAtomHashTable);
-      gAtomHashTable = nsnull;
-    }
-  }
-}
-
-NS_IMPL_ISUPPORTS1(AtomImpl, nsIAtom)
-
-void* AtomImpl::operator new(size_t size, const PRUnichar* us, PRInt32 uslen)
-{
-  size = size + uslen * sizeof(PRUnichar);
-  AtomImpl* ii = (AtomImpl*) ::operator new(size);
-  nsCRT::memcpy(ii->mString, us, uslen * sizeof(PRUnichar));
-  ii->mString[uslen] = 0;
-  return ii;
-}
-
-NS_IMETHODIMP 
-AtomImpl::ToString(nsString& aBuf) /*FIX: const */
-{
-  aBuf.SetLength(0);
-  aBuf.Append(mString, nsCRT::strlen(mString));
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-AtomImpl::GetUnicode(const PRUnichar **aResult) /*FIX: const */
-{
-  NS_ENSURE_ARG_POINTER(aResult);
-  *aResult = mString;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-AtomImpl::SizeOf(nsISizeOfHandler* aHandler, PRUint32* _retval) /*FIX: const */
-{
-  NS_ENSURE_ARG_POINTER(_retval);
-  PRUint32 sum = sizeof(*this) + nsCRT::strlen(mString) * sizeof(PRUnichar);
-  *_retval = sum;
-  return NS_OK;
-}
-
-//----------------------------------------------------------------------
-
-static PLHashNumber HashKey(const PRUnichar* k)
-{
-  return (PLHashNumber) nsCRT::HashValue(k);
-}
-
-static PRIntn CompareKeys(const PRUnichar* k1, const PRUnichar* k2)
-{
-  return nsCRT::strcmp(k1, k2) == 0;
-}
-
-NS_COM nsIAtom* NS_NewAtom(const char* isolatin1)
-{
-  nsAutoString tmp(isolatin1);
-  return NS_NewAtom(tmp.GetUnicode());
-}
-
-NS_COM nsIAtom* NS_NewAtom(const nsString& aString)
-{
-  return NS_NewAtom(aString.GetUnicode());
-}
-
-NS_COM nsIAtom* NS_NewAtom(const PRUnichar* us)
-{
-  if (nsnull == gAtomHashTable) {
-    gAtomHashTable = PL_NewHashTable(8, (PLHashFunction) HashKey,
-                                     (PLHashComparator) CompareKeys,
-                                     (PLHashComparator) nsnull,
-                                     nsnull, nsnull);
-  }
-  PRUint32 uslen;
-  PRUint32 hashCode = nsCRT::HashValue(us, &uslen);
-  PLHashEntry** hep = PL_HashTableRawLookup(gAtomHashTable, hashCode, us);
-  PLHashEntry* he = *hep;
-  if (nsnull != he) {
-    nsIAtom* id = (nsIAtom*) he->value;
-    NS_ADDREF(id);
-    return id;
-  }
-  AtomImpl* id = new(us, uslen) AtomImpl();
-  PL_HashTableRawAdd(gAtomHashTable, hep, hashCode, id->mString, id);
-  NS_ADDREF(id);
-  return id;
-}
-
-NS_COM nsrefcnt NS_GetNumberOfAtoms(void)
-{
-  if (nsnull != gAtomHashTable) {
-    NS_PRECONDITION(nsrefcnt(gAtomHashTable->nentries) == gAtoms, "bad atom table");
-  }
-  return gAtoms;
-}

mozilla/xpcom/ds/nsAtomTable.h

@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsAtomTable_h__
-#define nsAtomTable_h__
-
-#include "nsIAtom.h"
-
-class AtomImpl : public nsIAtom {
-public:
-  AtomImpl();
-  virtual ~AtomImpl();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIATOM
-
-  void* operator new(size_t size, const PRUnichar* us, PRInt32 uslen);
-
-  void operator delete(void* ptr) {
-    ::operator delete(ptr);
-  }
-
-  // Actually more; 0 terminated. This slot is reserved for the
-  // terminating zero.
-  PRUnichar mString[1];
-};
-
-#endif // nsAtomTable_h__

mozilla/xpcom/ds/nsBuffer.cpp

@@ -1,723 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsBuffer.h"
-#include "nsAutoLock.h"
-#include "nsCRT.h"
-#include "nsIInputStream.h"
-#include "nsIServiceManager.h"
-#include "nsIPageManager.h"
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsBuffer::nsBuffer()
-    : mGrowBySize(0),
-      mMaxSize(0),
-      mAllocator(nsnull),
-      mObserver(nsnull),
-      mBufferSize(0),
-      mReadSegment(nsnull),
-      mReadCursor(0),
-      mWriteSegment(nsnull),
-      mWriteCursor(0),
-      mReaderClosed(PR_FALSE),
-      mCondition(NS_OK)
-{
-    NS_INIT_REFCNT();
-    PR_INIT_CLIST(&mSegments);
-}
-
-NS_IMETHODIMP
-nsBuffer::Init(PRUint32 growBySize, PRUint32 maxSize,
-               nsIBufferObserver* observer, nsIAllocator* allocator)
-{
-    NS_ASSERTION(sizeof(PRCList) <= SEGMENT_OVERHEAD,
-                 "need to change SEGMENT_OVERHEAD size");
-    NS_ASSERTION(growBySize > SEGMENT_OVERHEAD, "bad growBySize");
-    mGrowBySize = growBySize;
-    mMaxSize = maxSize;
-    mObserver = observer;
-    NS_IF_ADDREF(mObserver);
-    mAllocator = allocator;
-    NS_ADDREF(mAllocator);
-    return NS_OK;
-}
-
-nsBuffer::~nsBuffer()
-{
-    // Free any allocated pages...
-    while (!PR_CLIST_IS_EMPTY(&mSegments)) {
-        PRCList* header = (PRCList*)mSegments.next;
-        char* segment = (char*)header;
-
-        PR_REMOVE_LINK(header);     // unlink from mSegments
-        (void) mAllocator->Free(segment);
-    }
-
-    NS_IF_RELEASE(mObserver);
-    NS_IF_RELEASE(mAllocator);
-}
-
-NS_IMPL_ISUPPORTS1(nsBuffer, nsIBuffer)
-
-NS_METHOD
-nsBuffer::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    nsBuffer* buf = new nsBuffer();
-    if (buf == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(buf);
-    nsresult rv = buf->QueryInterface(aIID, aResult);
-    NS_RELEASE(buf);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsresult
-nsBuffer::PushWriteSegment()
-{
-    nsAutoCMonitor mon(this);        // protect mSegments
-
-    if (mBufferSize >= mMaxSize) {
-        if (mObserver) {
-            nsresult rv = mObserver->OnFull(this);
-            if (NS_FAILED(rv)) return rv;
-        }
-        return NS_BASE_STREAM_WOULD_BLOCK;
-    }
-
-    // allocate a new segment to write into
-    PRCList* header;
-
-    header = (PRCList*)mAllocator->Alloc(mGrowBySize);
-    if (header == nsnull) 
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    mBufferSize += mGrowBySize;
-
-    PR_INSERT_BEFORE(header, &mSegments);       // insert at end
-
-    // initialize the write segment
-    mWriteSegment = header;
-    mWriteSegmentEnd = (char*)mWriteSegment + mGrowBySize;
-    mWriteCursor = (char*)mWriteSegment + sizeof(PRCList);
-
-    return NS_OK;
-}
-
-nsresult
-nsBuffer::PopReadSegment()
-{
-    nsresult rv;
-    nsAutoCMonitor mon(this);        // protect mSegments
-
-    PRCList* header = (PRCList*)mSegments.next;
-    char* segment = (char*)header;
-
-    NS_ASSERTION(mReadSegment == header, "wrong segment");
-
-    // make sure that the writer isn't still in this segment (that the
-    // reader is removing)
-    NS_ASSERTION(!(segment <= mWriteCursor && mWriteCursor < segment + mGrowBySize),
-                 "removing writer's segment");
-
-    PR_REMOVE_LINK(header);     // unlink from mSegments
-
-    mBufferSize -= mGrowBySize;
-
-    rv = mAllocator->Free(segment);
-    if (NS_FAILED(rv)) return rv;
-
-    // initialize the read segment
-    if (PR_CLIST_IS_EMPTY(&mSegments)) {
-        mReadSegment = nsnull;
-        mReadSegmentEnd = nsnull;
-        mReadCursor = nsnull;
-        if (mObserver) {
-            rv = mObserver->OnEmpty(this);
-            if (NS_FAILED(rv)) return rv;
-        }
-        return NS_BASE_STREAM_WOULD_BLOCK;
-    }
-    else {
-        mReadSegment = mSegments.next;
-        mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
-        mReadCursor = (char*)mReadSegment + sizeof(PRCList);
-    }
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIBuffer methods:
-
-NS_IMETHODIMP
-nsBuffer::ReadSegments(nsWriteSegmentFun writer, void* closure, PRUint32 count,
-                       PRUint32 *readCount)
-{
-    NS_ASSERTION(!mReaderClosed, "state change error");
-
-    nsAutoCMonitor mon(this);
-    nsresult rv = NS_OK;
-    PRUint32 readBufferLen;
-    const char* readBuffer;
-
-    *readCount = 0;
-    while (count > 0) {
-        rv = GetReadSegment(0, &readBuffer, &readBufferLen);
-        if (NS_FAILED(rv) || readBufferLen == 0) {
-            return *readCount == 0 ? rv : NS_OK;
-        }
-
-        readBufferLen = PR_MIN(readBufferLen, count);
-        while (readBufferLen > 0) {
-            PRUint32 writeCount;
-            rv = writer(closure, readBuffer, *readCount, readBufferLen, &writeCount);
-			NS_ASSERTION(rv != NS_BASE_STREAM_EOF, "Write should not return EOF");
-            if (rv == NS_BASE_STREAM_WOULD_BLOCK || NS_FAILED(rv) || writeCount == 0) {
-                // if we failed to write just report what we were
-                // able to read so far
-                return *readCount == 0 ? rv : NS_OK;
-            }
-            NS_ASSERTION(writeCount <= readBufferLen, "writer returned bad writeCount");
-            readBuffer += writeCount;
-            readBufferLen -= writeCount;
-            *readCount += writeCount;
-            count -= writeCount;
-
-            if (mReadCursor + writeCount == mReadSegmentEnd) {
-                rv = PopReadSegment();
-                if (NS_FAILED(rv)) {
-                    return *readCount == 0 ? rv : NS_OK;
-                }
-            }
-            else {
-                mReadCursor += writeCount;
-            }
-        }
-    }
-    return NS_OK;
-}
-
-static NS_METHOD
-nsWriteToRawBuffer(void* closure,
-                   const char* fromRawSegment,
-                   PRUint32 offset,
-                   PRUint32 count,
-                   PRUint32 *writeCount)
-{
-    char* toBuf = (char*)closure;
-    nsCRT::memcpy(&toBuf[offset], fromRawSegment, count);
-    *writeCount = count;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBuffer::Read(char* toBuf, PRUint32 bufLen, PRUint32 *readCount)
-{
-    return ReadSegments(nsWriteToRawBuffer, toBuf, bufLen, readCount);
-}
-
-NS_IMETHODIMP
-nsBuffer::GetReadSegment(PRUint32 segmentLogicalOffset, 
-                         const char* *resultSegment,
-                         PRUint32 *resultSegmentLen)
-{
-    nsAutoCMonitor mon(this);
-
-    // set the read segment and cursor if not already set
-    if (mReadSegment == nsnull) {
-        if (PR_CLIST_IS_EMPTY(&mSegments)) {
-            *resultSegmentLen = 0;
-            *resultSegment = nsnull;
-            return mCondition;
-        }
-        else {
-            mReadSegment = mSegments.next;
-            mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
-            mReadCursor = (char*)mReadSegment + sizeof(PRCList);
-        }
-    }
-
-    // now search for the segment starting from segmentLogicalOffset and return it
-    PRCList* curSeg = mReadSegment;
-    char* curSegStart = mReadCursor;
-    char* curSegEnd = mReadSegmentEnd;
-    PRInt32 amt;
-    PRInt32 offset = (PRInt32)segmentLogicalOffset;
-    while (offset >= 0) {
-        // snapshot the write cursor into a local variable -- this allows
-        // a writer to freely change it while we're reading while avoiding
-        // using a lock
-        char* snapshotWriteCursor = mWriteCursor;   // atomic
-
-        // next check if the write cursor is in our segment
-        if (curSegStart <= snapshotWriteCursor &&
-            snapshotWriteCursor < curSegEnd) {
-            // same segment -- read up to the snapshotWriteCursor
-            curSegEnd = snapshotWriteCursor;
-
-            amt = curSegEnd - curSegStart;
-            if (offset < amt) {
-                // segmentLogicalOffset is in this segment, so read up to its end
-                *resultSegmentLen = amt - offset;
-                *resultSegment = curSegStart + offset;
-                return NS_OK;
-            }
-            else {
-                // don't continue past the write segment
-                *resultSegmentLen = 0;
-                *resultSegment = nsnull;
-                return mCondition;
-            }
-        }
-        else {
-            amt = curSegEnd - curSegStart;
-            if (offset < amt) {
-                // segmentLogicalOffset is in this segment, so read up to its end
-                *resultSegmentLen = amt - offset;
-                *resultSegment = curSegStart + offset;
-                return NS_OK;
-            }
-            else {
-                curSeg = PR_NEXT_LINK(curSeg);
-                if (curSeg == mReadSegment) {
-                    // been all the way around
-                    *resultSegmentLen = 0;
-                    *resultSegment = nsnull;
-                    return mCondition;
-                }
-                curSegEnd = (char*)curSeg + mGrowBySize;
-                curSegStart = (char*)curSeg + sizeof(PRCList);
-                offset -= amt;
-            }
-        }
-    }
-    NS_NOTREACHED("nsBuffer::GetReadSegment failed");
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsBuffer::GetReadableAmount(PRUint32 *result)
-{
-    NS_ASSERTION(!mReaderClosed, "state change error");
-
-    nsAutoCMonitor mon(this);
-    *result = 0; 
-
-    // first set the read segment and cursor if not already set
-    if (mReadSegment == nsnull) {
-        if (PR_CLIST_IS_EMPTY(&mSegments)) {
-            return NS_OK;
-        }
-        else {
-            mReadSegment = mSegments.next;
-            mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
-            mReadCursor = (char*)mReadSegment + sizeof(PRCList);
-        }
-    }
-
-    // now search for the segment starting from segmentLogicalOffset and return it
-    PRCList* curSeg = mReadSegment;
-    char* curSegStart = mReadCursor;
-    char* curSegEnd = mReadSegmentEnd;
-    PRInt32 amt;
-    while (PR_TRUE) {
-        // snapshot the write cursor into a local variable -- this allows
-        // a writer to freely change it while we're reading while avoiding
-        // using a lock
-        char* snapshotWriteCursor = mWriteCursor;   // atomic
-
-        // next check if the write cursor is in our segment
-        if (curSegStart <= snapshotWriteCursor &&
-            snapshotWriteCursor < curSegEnd) {
-            // same segment -- read up to the snapshotWriteCursor
-            curSegEnd = snapshotWriteCursor;
-
-            amt = curSegEnd - curSegStart;
-            *result += amt;
-            return NS_OK;
-        }
-        else {
-            amt = curSegEnd - curSegStart;
-            *result += amt;
-            curSeg = PR_NEXT_LINK(curSeg);
-            if (curSeg == mReadSegment) {
-                // been all the way around
-                return NS_OK;
-            }
-            curSegEnd = (char*)curSeg + mGrowBySize;
-            curSegStart = (char*)curSeg + sizeof(PRCList);
-        }
-    }
-    return NS_ERROR_FAILURE;
-}
-
-#define COMPARE(s1, s2, i)	ignoreCase ? nsCRT::strncasecmp((const char *)s1, (const char *)s2, (PRUint32)i) : nsCRT::strncmp((const char *)s1, (const char *)s2, (PRUint32)i)
-
-NS_IMETHODIMP
-nsBuffer::Search(const char* string, PRBool ignoreCase, 
-                 PRBool *found, PRUint32 *offsetSearchedTo)
-{
-    NS_ASSERTION(!mReaderClosed, "state change error");
-
-    nsresult rv;
-    const char* bufSeg1;
-    PRUint32 bufSegLen1;
-    PRUint32 segmentPos = 0;
-    PRUint32 strLen = nsCRT::strlen(string);
-
-    rv = GetReadSegment(segmentPos, &bufSeg1, &bufSegLen1);
-    if (NS_FAILED(rv) || bufSegLen1 == 0) {
-        *found = PR_FALSE;
-        *offsetSearchedTo = segmentPos;
-        return NS_OK;
-    }
-
-    while (PR_TRUE) {
-        PRUint32 i;
-        // check if the string is in the buffer segment
-        for (i = 0; i < bufSegLen1 - strLen + 1; i++) {
-            if (COMPARE(&bufSeg1[i], string, strLen) == 0) {
-                *found = PR_TRUE;
-                *offsetSearchedTo = segmentPos + i;
-                return NS_OK;
-            }
-        }
-
-        // get the next segment
-        const char* bufSeg2;
-        PRUint32 bufSegLen2;
-        segmentPos += bufSegLen1;
-        rv = GetReadSegment(segmentPos, &bufSeg2, &bufSegLen2);
-        if (NS_FAILED(rv) || bufSegLen2 == 0) {
-            *found = PR_FALSE;
-            if (mCondition != NS_OK)    // XXX NS_FAILED?
-                *offsetSearchedTo = segmentPos - bufSegLen1;
-            else
-                *offsetSearchedTo = segmentPos - bufSegLen1 - strLen + 1;
-            return NS_OK;
-        }
-
-        // check if the string is straddling the next buffer segment
-        PRUint32 limit = PR_MIN(strLen, bufSegLen2 + 1);
-        for (i = 0; i < limit; i++) {
-            PRUint32 strPart1Len = strLen - i - 1;
-            PRUint32 strPart2Len = strLen - strPart1Len;
-            const char* strPart2 = &string[strLen - strPart2Len];
-            PRUint32 bufSeg1Offset = bufSegLen1 - strPart1Len;
-            if (COMPARE(&bufSeg1[bufSeg1Offset], string, strPart1Len) == 0 &&
-                COMPARE(bufSeg2, strPart2, strPart2Len) == 0) {
-                *found = PR_TRUE;
-                *offsetSearchedTo = segmentPos - strPart1Len;
-                return NS_OK;
-            }
-        }
-
-        // finally continue with the next buffer
-        bufSeg1 = bufSeg2;
-        bufSegLen1 = bufSegLen2;
-    }
-    NS_NOTREACHED("can't get here");
-    return NS_ERROR_FAILURE;    // keep compiler happy
-}
-
-NS_IMETHODIMP
-nsBuffer::ReaderClosed()
-{
-    nsresult rv = NS_OK;
-    nsAutoCMonitor mon(this);        // protect mSegments
-
-    // first prevent any more writing
-    mReaderClosed = PR_TRUE;
-
-    // then free any unread segments...
-    
-    // first set the read segment and cursor if not already set
-    if (mReadSegment == nsnull) {
-        if (!PR_CLIST_IS_EMPTY(&mSegments)) {
-            mReadSegment = mSegments.next;
-            mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
-            mReadCursor = (char*)mReadSegment + sizeof(PRCList);
-        }
-    }
-
-    while (mReadSegment) {
-        // snapshot the write cursor into a local variable -- this allows
-        // a writer to freely change it while we're reading while avoiding
-        // using a lock
-        char* snapshotWriteCursor = mWriteCursor;   // atomic
-
-        // next check if the write cursor is in our segment
-        if (mReadCursor <= snapshotWriteCursor &&
-            snapshotWriteCursor < mReadSegmentEnd) {
-            // same segment -- we've discarded all the unread segments we
-            // can, so just updatethe read cursor
-            mReadCursor = mWriteCursor;
-            break;
-        }
-        // else advance to the next segment, freeing this one
-        rv = PopReadSegment();
-        if (NS_FAILED(rv)) break;
-    }
-
-#ifdef DEBUG
-    PRUint32 amt;
-    const char* buf;
-    rv = GetReadSegment(0, &buf, &amt);
-    NS_ASSERTION(rv == NS_BASE_STREAM_EOF ||
-                 (NS_SUCCEEDED(rv) && amt == 0), "ReaderClosed failed");
-#endif
-
-    return rv;
-}
-
-NS_IMETHODIMP
-nsBuffer::GetCondition(nsresult *result)
-{
-    *result = mCondition;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-NS_IMETHODIMP
-nsBuffer::WriteSegments(nsReadSegmentFun reader, void* closure, PRUint32 count,
-                        PRUint32 *writeCount)
-{
-    nsresult rv = NS_OK;
-
-    nsAutoCMonitor mon(this);
-    *writeCount = 0;
-
-    if (mReaderClosed) {
-        rv = NS_BASE_STREAM_CLOSED;
-        goto done;
-    }
-
-    if (NS_FAILED(mCondition)) {
-        rv = mCondition;
-        goto done;
-    }
-
-    while (count > 0) {
-        PRUint32 writeBufLen;
-        char* writeBuf;
-        rv = GetWriteSegment(&writeBuf, &writeBufLen);
-        if (NS_FAILED(rv) || writeBufLen == 0) {
-            // if we failed to allocate a new segment, we're probably out
-            // of memory, but we don't care -- just report what we were
-            // able to write so far
-            rv = (*writeCount == 0) ? rv : NS_OK;
-            goto done;
-        }
-
-        writeBufLen = PR_MIN(writeBufLen, count);
-        while (writeBufLen > 0) {
-            PRUint32 readCount = 0;
-            rv = reader(closure, writeBuf, *writeCount, writeBufLen, &readCount);
-            if (rv == NS_BASE_STREAM_WOULD_BLOCK || readCount == 0) {
-                // if the place we're putting the data would block (probably ran
-                // out of room) just return what we were able to write so far
-                rv = (*writeCount == 0) ? rv : NS_OK;
-                goto done;
-            }
-            if (NS_FAILED(rv)) {
-                // save the failure condition so that we can get it again later
-                nsresult rv2 = SetCondition(rv);
-                NS_ASSERTION(NS_SUCCEEDED(rv2), "SetCondition failed");
-                // if we failed to read just report what we were
-                // able to write so far
-                rv = (*writeCount == 0) ? rv : NS_OK;
-                goto done;
-            }
-            NS_ASSERTION(readCount <= writeBufLen, "reader returned bad readCount");
-            writeBuf += readCount;
-            writeBufLen -= readCount;
-            *writeCount += readCount;
-            count -= readCount;
-
-            // set the write cursor after the data is valid
-            if (mWriteCursor + readCount == mWriteSegmentEnd) {
-                mWriteSegment = nsnull;      // allocate a new segment next time around
-                mWriteSegmentEnd = nsnull;
-                mWriteCursor = nsnull;
-            }
-            else
-                mWriteCursor += readCount;
-        }
-    }
-done:
-    if (mObserver && *writeCount) {
-        mObserver->OnWrite(this, *writeCount);
-    }
-    return rv;
-}
-
-static NS_METHOD
-nsReadFromRawBuffer(void* closure,
-                    char* toRawSegment,
-                    PRUint32 offset,
-                    PRUint32 count,
-                    PRUint32 *readCount)
-{
-    const char* fromBuf = (const char*)closure;
-    nsCRT::memcpy(toRawSegment, &fromBuf[offset], count);
-    *readCount = count;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBuffer::Write(const char* fromBuf, PRUint32 bufLen, PRUint32 *writeCount)
-{
-    return WriteSegments(nsReadFromRawBuffer, (void*)fromBuf, bufLen, writeCount);
-}
-
-static NS_METHOD
-nsReadFromInputStream(void* closure,
-                      char* toRawSegment, 
-                      PRUint32 offset,
-                      PRUint32 count,
-                      PRUint32 *readCount)
-{
-    nsIInputStream* fromStream = (nsIInputStream*)closure;
-    return fromStream->Read(toRawSegment, count, readCount);
-}
-
-NS_IMETHODIMP
-nsBuffer::WriteFrom(nsIInputStream* fromStream, PRUint32 count, PRUint32 *writeCount)
-{
-    return WriteSegments(nsReadFromInputStream, fromStream, count, writeCount);
-}
-
-NS_IMETHODIMP
-nsBuffer::GetWriteSegment(char* *resultSegment,
-                          PRUint32 *resultSegmentLen)
-{
-    nsAutoCMonitor mon(this);
-    if (mReaderClosed)
-        return NS_BASE_STREAM_CLOSED;
-
-    nsresult rv;
-    *resultSegmentLen = 0;
-    *resultSegment = nsnull;
-    if (mWriteSegment == nsnull) {
-        rv = PushWriteSegment();
-        if (NS_FAILED(rv) || rv == NS_BASE_STREAM_WOULD_BLOCK) return rv;
-
-        NS_ASSERTION(mWriteSegment != nsnull, "failed to allocate segment");
-    }
-
-    *resultSegmentLen = mWriteSegmentEnd - mWriteCursor;
-    *resultSegment = mWriteCursor;
-    NS_ASSERTION(*resultSegmentLen > 0, "Failed to get write segment.");
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBuffer::GetWritableAmount(PRUint32 *amount)
-{
-    if (mReaderClosed)
-        return NS_BASE_STREAM_CLOSED;
-
-    nsresult rv;
-    PRUint32 readableAmount;
-    rv = GetReadableAmount(&readableAmount);
-    if (NS_FAILED(rv)) return rv;
-    *amount = mMaxSize - readableAmount;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBuffer::GetReaderClosed(PRBool *result)
-{
-    *result = mReaderClosed;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBuffer::SetCondition(nsresult condition)
-{
-    nsAutoCMonitor mon(this);
-    if (mReaderClosed)
-        return NS_BASE_STREAM_CLOSED;
-
-    mCondition = condition;
-    mWriteSegment = nsnull;     // allows reader to free last segment w/o asserting
-    mWriteSegmentEnd = nsnull;
-    // don't reset mWriteCursor here -- we need it for the EOF point in the buffer
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-static NS_DEFINE_CID(kAllocatorCID, NS_ALLOCATOR_CID);
-
-NS_COM nsresult
-NS_NewBuffer(nsIBuffer* *result,
-             PRUint32 growBySize, PRUint32 maxSize,
-             nsIBufferObserver* observer)
-{
-    nsresult rv;
-    NS_WITH_SERVICE(nsIAllocator, alloc, kAllocatorCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsBuffer* buf;
-    rv = nsBuffer::Create(NULL, nsIBuffer::GetIID(), (void**)&buf);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = buf->Init(growBySize, maxSize, observer, alloc);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(buf);
-        return rv;
-    }
-
-    *result = buf;
-    return NS_OK;
-}
-
-static NS_DEFINE_CID(kPageManagerCID, NS_PAGEMANAGER_CID);
-
-NS_COM nsresult
-NS_NewPageBuffer(nsIBuffer* *result,
-                 PRUint32 growBySize, PRUint32 maxSize,
-                 nsIBufferObserver* observer)
-{
-    nsresult rv;
-    NS_WITH_SERVICE(nsIAllocator, alloc, kPageManagerCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsBuffer* buf;
-    rv = nsBuffer::Create(NULL, nsIBuffer::GetIID(), (void**)&buf);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = buf->Init(growBySize, maxSize, observer, alloc);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(buf);
-        return rv;
-    }
-
-    *result = buf;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/xpcom/ds/nsBuffer.h

@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsBuffer_h___
-#define nsBuffer_h___
-
-#include "nsIBuffer.h"
-#include "nscore.h"
-#include "prclist.h"
-#include "nsIAllocator.h"
-
-class nsBuffer : public nsIBuffer {
-public:
-    NS_DECL_ISUPPORTS
-
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-    // nsIBuffer methods:
-    NS_IMETHOD Init(PRUint32 growBySize, PRUint32 maxSize,
-                    nsIBufferObserver* observer, nsIAllocator* allocator);
-    NS_IMETHOD Read(char* toBuf, PRUint32 bufLen, PRUint32 *readCount);
-    NS_IMETHOD ReadSegments(nsWriteSegmentFun writer, void* closure, PRUint32 count,
-                            PRUint32 *readCount);
-    NS_IMETHOD GetReadSegment(PRUint32 segmentLogicalOffset, 
-                              const char* *resultSegment,
-                              PRUint32 *resultSegmentLen);
-    NS_IMETHOD GetReadableAmount(PRUint32 *amount);
-    NS_IMETHOD Search(const char* forString, PRBool ignoreCase,
-                      PRBool *found, PRUint32 *offsetSearchedTo);
-    NS_IMETHOD ReaderClosed(void);
-    NS_IMETHOD GetCondition(nsresult *result);
-
-    NS_IMETHOD Write(const char* fromBuf, PRUint32 bufLen, PRUint32 *writeCount);
-    NS_IMETHOD WriteFrom(nsIInputStream* fromStream, PRUint32 count, PRUint32 *writeCount);
-    NS_IMETHOD WriteSegments(nsReadSegmentFun reader, void* closure, PRUint32 count,
-                             PRUint32 *writeCount);
-    NS_IMETHOD GetWriteSegment(char* *resultSegment,
-                               PRUint32 *resultSegmentLen);
-    NS_IMETHOD GetWritableAmount(PRUint32 *amount);
-    NS_IMETHOD GetReaderClosed(PRBool *result);
-    NS_IMETHOD SetCondition(nsresult condition);
-
-    // nsBuffer methods:
-    nsBuffer();
-    virtual ~nsBuffer();
-
-    nsresult PushWriteSegment();
-    nsresult PopReadSegment();
-
-protected:
-    PRUint32            mGrowBySize;
-    PRUint32            mMaxSize;
-    nsIAllocator*       mAllocator;
-    nsIBufferObserver*  mObserver;
-
-    PRCList             mSegments;
-    PRUint32            mBufferSize;
-    
-    PRCList*            mReadSegment;
-    char*               mReadSegmentEnd;
-    char*               mReadCursor;
-
-    PRCList*            mWriteSegment;
-    char*               mWriteSegmentEnd;
-    char*               mWriteCursor;
-
-    PRBool              mReaderClosed;
-    nsresult            mCondition;
-};
-
-#endif // nsBuffer_h___

mozilla/xpcom/ds/nsBufferPoolService.h

@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsBufferPoolService_h___
-#define nsBufferPoolService_h___
-
-#include "nsIBufferPoolService.h"
-
-class nsBufferPoolService : public nsIBufferPoolService {
-public:
-    NS_DECL_ISUPPORTS
-
-    // nsIBufferPoolService methods:
-    NS_IMETHOD NewBuffer(PRUint32 minSize, PRUint32 maxSize,
-                         nsIByteBuffer* *result);
-
-    // nsBufferPoolService methods:
-    nsBufferPoolService();
-    virtual ~nsBufferPoolService();
-
-protected:
-    
-};
-
-#endif // nsBufferPoolService_h___

mozilla/xpcom/ds/nsByteBuffer.cpp

@@ -1,151 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsByteBuffer.h"
-#include "nsIInputStream.h"
-#include "nsCRT.h"
-
-#define MIN_BUFFER_SIZE 32
-
-ByteBufferImpl::ByteBufferImpl(void)
-  : mBuffer(NULL), mSpace(0), mLength(0)
-{
-  NS_INIT_REFCNT();
-}
-
-NS_IMETHODIMP
-ByteBufferImpl::Init(PRUint32 aBufferSize)
-{
-  if (aBufferSize < MIN_BUFFER_SIZE) {
-    aBufferSize = MIN_BUFFER_SIZE;
-  }
-  mSpace = aBufferSize;
-  mLength = 0;
-  mBuffer = new char[aBufferSize];
-  return mBuffer ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMPL_ISUPPORTS1(ByteBufferImpl,nsIByteBuffer)
-
-ByteBufferImpl::~ByteBufferImpl()
-{
-  if (nsnull != mBuffer) {
-    delete[] mBuffer;
-    mBuffer = nsnull;
-  }
-  mLength = 0;
-}
-
-NS_METHOD
-ByteBufferImpl::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-  if (aOuter)
-    return NS_ERROR_NO_AGGREGATION;
-
-  ByteBufferImpl* it = new ByteBufferImpl();
-  if (nsnull == it) 
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(it);
-  nsresult rv = it->QueryInterface(aIID, (void**)aResult);
-  NS_RELEASE(it);
-  return rv;
-}
-
-NS_IMETHODIMP_(PRUint32)
-ByteBufferImpl::GetLength(void) const
-{
-  return mLength;
-}
-
-NS_IMETHODIMP_(PRUint32)
-ByteBufferImpl::GetBufferSize(void) const
-{
-  return mSpace;
-}
-
-NS_IMETHODIMP_(char*)
-ByteBufferImpl::GetBuffer(void) const
-{
-  return mBuffer;
-}
-
-NS_IMETHODIMP_(PRBool)
-ByteBufferImpl::Grow(PRUint32 aNewSize)
-{
-  if (aNewSize < MIN_BUFFER_SIZE) {
-    aNewSize = MIN_BUFFER_SIZE;
-  }
-  char* newbuf = new char[aNewSize];
-  if (nsnull != newbuf) {
-    if (0 != mLength) {
-      nsCRT::memcpy(newbuf, mBuffer, mLength);
-    }
-    delete[] mBuffer;
-    mBuffer = newbuf;
-    return PR_TRUE;
-  }
-  return PR_FALSE;
-}
-
-NS_IMETHODIMP_(PRInt32)
-ByteBufferImpl::Fill(nsresult* aErrorCode, nsIInputStream* aStream,
-                     PRUint32 aKeep)
-{
-  NS_PRECONDITION(nsnull != aStream, "null stream");
-  NS_PRECONDITION(aKeep <= mLength, "illegal keep count");
-  if ((nsnull == aStream) || (PRUint32(aKeep) > PRUint32(mLength))) {
-    // whoops
-    *aErrorCode = NS_BASE_STREAM_ILLEGAL_ARGS;
-    return -1;
-  }
-
-  if (0 != aKeep) {
-    // Slide over kept data
-    nsCRT::memmove(mBuffer, mBuffer + (mLength - aKeep), aKeep);
-  }
-
-  // Read in some new data
-  mLength = aKeep;
-  PRUint32 nb;
-  *aErrorCode = aStream->Read(mBuffer + aKeep, mSpace - aKeep, &nb);
-  if (NS_SUCCEEDED(*aErrorCode)) {
-    mLength += nb;
-  }
-  else
-    nb = 0;
-  return nb;
-}
-
-NS_COM nsresult NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
-                                  nsISupports* aOuter,
-                                  PRUint32 aBufferSize)
-{
-  nsresult rv;
-  nsIByteBuffer* buf;
-  rv = ByteBufferImpl::Create(aOuter, nsIByteBuffer::GetIID(), (void**)&buf);
-  if (NS_FAILED(rv)) return rv;
-    
-  rv = buf->Init(aBufferSize);
-  if (NS_FAILED(rv)) {
-    NS_RELEASE(buf);
-    return rv;
-  }
-  *aInstancePtrResult = buf;
-  return rv;
-}

mozilla/xpcom/ds/nsByteBuffer.h

@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsByteBuffer_h__
-#define nsByteBuffer_h__
-
-#include "nsIByteBuffer.h"
-
-class ByteBufferImpl : public nsIByteBuffer {
-public:
-  ByteBufferImpl(void);
-  virtual ~ByteBufferImpl();
-
-  NS_DECL_ISUPPORTS
-
-  static NS_METHOD
-  Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-  NS_IMETHOD Init(PRUint32 aBufferSize);
-  NS_IMETHOD_(PRUint32) GetLength(void) const;
-  NS_IMETHOD_(PRUint32) GetBufferSize(void) const;
-  NS_IMETHOD_(char*) GetBuffer() const;
-  NS_IMETHOD_(PRBool) Grow(PRUint32 aNewSize);
-  NS_IMETHOD_(PRInt32) Fill(nsresult* aErrorCode, nsIInputStream* aStream,
-                            PRUint32 aKeep);
-
-  char* mBuffer;
-  PRUint32 mSpace;
-  PRUint32 mLength;
-};
-
-#endif // nsByteBuffer_h__

mozilla/xpcom/ds/nsCRT.cpp

@@ -1,555 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */ 
-
- 
-/**
- * MODULE NOTES:
- * @update  gess7/30/98
- *
- * Much as I hate to do it, we were using string compares wrong.
- * Often, programmers call functions like strcmp(s1,s2), and pass
- * one or more null strings. Rather than blow up on these, I've 
- * added quick checks to ensure that cases like this don't cause
- * us to fail.
- *
- * In general, if you pass a null into any of these string compare
- * routines, we simply return 0.
- */
-
-
-#include "nsCRT.h"
-#include "nsUnicharUtilCIID.h"
-#include "nsIServiceManager.h"
-#include "nsICaseConversion.h"
-
-
-// XXX Bug: These tables don't lowercase the upper 128 characters properly
-
-// This table maps uppercase characters to lower case characters;
-// characters that are neither upper nor lower case are unaffected.
-static const unsigned char kUpper2Lower[256] = {
-    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-   64,
-
-    // upper band mapped to lower [A-Z] => [a-z]
-       97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
-  112,113,114,115,116,117,118,119,120,121,122,
-
-                                               91, 92, 93, 94, 95,
-   96, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
-  112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
-  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
-  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
-  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
-  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
-  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
-  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
-};
-
-static const unsigned char kLower2Upper[256] = {
-    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-   64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-   80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-   96,
-
-    // lower band mapped to upper [a-z] => [A-Z]
-       65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-   80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
-
-                                              123,124,125,126,127,
-  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
-  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
-  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
-  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
-  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
-  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
-};
-
-// XXX bug: this doesn't map 0x80 to 0x9f properly
- const PRUnichar kIsoLatin1ToUCS2[256] = {
-    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-   64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-   80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-   96, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
-  112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
-  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
-  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
-  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
-  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
-  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
-  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
-};
-
-//----------------------------------------------------------------------
-
-#define TOLOWER(_ucs2) \
-  (((_ucs2) < 128) ? PRUnichar(kUpper2Lower[_ucs2]) : _ToLower(_ucs2))
-
-#define TOUPPER(_ucs2) \
-  (((_ucs2) < 128) ? PRUnichar(kLower2Upper[_ucs2]) : _ToUpper(_ucs2))
-
-class HandleCaseConversionShutdown : public nsIShutdownListener {
-public :
-   NS_IMETHOD OnShutdown(const nsCID& cid, nsISupports* service);
-   HandleCaseConversionShutdown(void) { NS_INIT_REFCNT(); }
-   virtual ~HandleCaseConversionShutdown(void) {}
-   NS_DECL_ISUPPORTS
-};
-static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
-
-static nsICaseConversion * gCaseConv = NULL; 
-
-NS_IMPL_ISUPPORTS1(HandleCaseConversionShutdown, nsIShutdownListener)
-
-nsresult
-HandleCaseConversionShutdown::OnShutdown(const nsCID& cid,
-                                         nsISupports* aService)
-{
-  if (cid.Equals(kUnicharUtilCID)) {
-    NS_ASSERTION(aService == gCaseConv, "wrong service!");
-    gCaseConv->Release();
-    gCaseConv = NULL;
-  }
-  return NS_OK;
-}
-
-static HandleCaseConversionShutdown* gListener = NULL;
-
-static void StartUpCaseConversion()
-{
-    nsresult err;
-
-    if ( NULL == gListener )
-    {
-      gListener = new HandleCaseConversionShutdown();
-      gListener->AddRef();
-    }
-    err = nsServiceManager::GetService(kUnicharUtilCID, NS_GET_IID(nsICaseConversion),
-                                        (nsISupports**) &gCaseConv, gListener);
-}
-static void CheckCaseConversion()
-{
-    if(NULL == gCaseConv )
-      StartUpCaseConversion();
-
-    NS_ASSERTION( gCaseConv != NULL , "cannot obtain UnicharUtil");
-   
-}
-
-static PRUnichar _ToLower(PRUnichar aChar)
-{
-  PRUnichar oLower;
-  CheckCaseConversion();
-  nsresult err = gCaseConv->ToLower(aChar, &oLower);
-  NS_ASSERTION( NS_SUCCEEDED(err),  "failed to communicate to UnicharUtil");
-  return ( NS_SUCCEEDED(err) ) ? oLower : aChar ;
-}
-
-static PRUnichar _ToUpper(PRUnichar aChar)
-{
-  nsresult err;
-  PRUnichar oUpper;
-  CheckCaseConversion();
-  err = gCaseConv->ToUpper(aChar, &oUpper);
-  NS_ASSERTION( NS_SUCCEEDED(err),  "failed to communicate to UnicharUtil");
-  return ( NS_SUCCEEDED(err) ) ? oUpper : aChar ;
-}
-
-//----------------------------------------------------------------------
-
-PRUnichar nsCRT::ToUpper(PRUnichar aChar)
-{
-  return TOUPPER(aChar);
-}
-
-PRUnichar nsCRT::ToLower(PRUnichar aChar)
-{
-  return TOLOWER(aChar);
-}
-
-PRBool nsCRT::IsUpper(PRUnichar aChar)
-{
-  return aChar != nsCRT::ToLower(aChar);
-}
-
-PRBool nsCRT::IsLower(PRUnichar aChar)
-{
-  return aChar != nsCRT::ToUpper(aChar);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// My lovely strtok routine
-
-#define IS_DELIM(m, c)          ((m)[(c) >> 3] & (1 << ((c) & 7)))
-#define SET_DELIM(m, c)         ((m)[(c) >> 3] |= (1 << ((c) & 7)))
-#define DELIM_TABLE_SIZE        32
-
-char* nsCRT::strtok(char* string, const char* delims, char* *newStr)
-{
-  NS_ASSERTION(string, "Unlike regular strtok, the first argument cannot be null.");
-
-  char delimTable[DELIM_TABLE_SIZE];
-  PRUint32 i;
-  char* result;
-  char* str = string;
-
-  for (i = 0; i < DELIM_TABLE_SIZE; i++)
-    delimTable[i] = '\0';
-
-  for (i = 0; i < DELIM_TABLE_SIZE && delims[i]; i++) {
-    SET_DELIM(delimTable, delims[i]);
-  }
-  NS_ASSERTION(delims[i] == '\0', "too many delimiters");
-
-  // skip to beginning
-  while (*str && IS_DELIM(delimTable, *str)) {
-    str++;
-  }
-  result = str;
-
-  // fix up the end of the token
-  while (*str) {
-    if (IS_DELIM(delimTable, *str)) {
-      *str++ = '\0';
-      break;
-    }
-    str++;
-  }
-  *newStr = str;
-
-  return str == result ? NULL : result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-PRUint32 nsCRT::strlen(const PRUnichar* s)
-{
-  PRUint32 len = 0;
-  if(s) {
-    while (*s++ != 0) {
-      len++;
-    }
-  }
-  return len;
-}
-
-
-/**
- * Compare unichar string ptrs, stopping at the 1st null 
- * NOTE: If both are null, we return 0.
- * @update  gess7/30/98
- * @param   s1 and s2 both point to unichar strings
- * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
- */
-PRInt32 nsCRT::strcmp(const PRUnichar* s1, const PRUnichar* s2)
-{
-  if(s1 && s2) {
-    for (;;) {
-      PRUnichar c1 = *s1++;
-      PRUnichar c2 = *s2++;
-      if (c1 != c2) {
-        if (c1 < c2) return -1;
-        return 1;
-      }
-      if ((0==c1) || (0==c2)) break;
-    }
-  }
-  return 0;
-}
-
-/**
- * Compare unichar string ptrs, stopping at the 1st null or nth char.
- * NOTE: If either is null, we return 0.
- * @update  gess7/30/98
- * @param   s1 and s2 both point to unichar strings
- * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
- */
-PRInt32 nsCRT::strncmp(const PRUnichar* s1, const PRUnichar* s2, PRUint32 n)
-{
-  if(s1 && s2) { 
-    if(n != 0) {
-      do {
-        PRUnichar c1 = *s1++;
-        PRUnichar c2 = *s2++;
-        if (c1 != c2) {
-          if (c1 < c2) return -1;
-          return 1;
-        }
-        if ((0==c1) || (0==c2)) break;
-      } while (--n != 0);
-    }
-  }
-  return 0;
-}
-
-
-/**
- * Compare unichar string ptrs without regard to case
- * NOTE: If both are null, we return 0.
- * @update  gess7/30/98
- * @param   s1 and s2 both point to unichar strings
- * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
- */
-PRInt32 nsCRT::strcasecmp(const PRUnichar* s1, const PRUnichar* s2)
-{
-  if(s1 && s2) {
-    for (;;) {
-      PRUnichar c1 = *s1++;
-      PRUnichar c2 = *s2++;
-      if (c1 != c2) {
-        c1 = TOLOWER(c1);
-        c2 = TOLOWER(c2);
-        if (c1 != c2) {
-          if (c1 < c2) return -1;
-          return 1;
-        }
-      }
-      if ((0==c1) || (0==c2)) break;
-    }
-  }
-  return 0;
-}
-
-/**
- * Compare unichar string ptrs, stopping at the 1st null or nth char;
- * also ignoring the case of characters.
- * NOTE: If both are null, we return 0.
- * @update  gess7/30/98
- * @param   s1 and s2 both point to unichar strings
- * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
- */
-PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const PRUnichar* s2, PRUint32 n)
-{
-  if(s1 && s2) {
-    if(n != 0){
-      do {
-        PRUnichar c1 = *s1++;
-        PRUnichar c2 = *s2++;
-        if (c1 != c2) {
-          c1 = TOLOWER(c1);
-          c2 = TOLOWER(c2);
-          if (c1 != c2) {
-            if (c1 < c2) return -1;
-            return 1;
-          }
-        }
-        if ((0==c1) || (0==c2)) break;
-      } while (--n != 0);
-    }
-  }
-  return 0;
-}
-
-
-/**
- * Compare a unichar string ptr to cstring.
- * NOTE: If both are null, we return 0.
- * @update  gess7/30/98
- * @param   s1 points to unichar string
- * @param   s2 points to cstring
- * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
- */
-PRInt32 nsCRT::strcmp(const PRUnichar* s1, const char* s2)
-{
-  if(s1 && s2) {
-    for (;;) {
-      PRUnichar c1 = *s1++;
-      PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
-      if (c1 != c2) {
-        if (c1 < c2) return -1;
-        return 1;
-      }
-      if ((0==c1) || (0==c2)) break;
-    }
-  }
-  return 0;
-}
-
-
-/**
- * Compare a unichar string ptr to cstring, up to N chars.
- * NOTE: If both are null, we return 0.
- * @update  gess7/30/98
- * @param   s1 points to unichar string
- * @param   s2 points to cstring
- * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
- */
-PRInt32 nsCRT::strncmp(const PRUnichar* s1, const char* s2, PRUint32 n)
-{
-  if(s1 && s2) {
-    if(n != 0){
-      do {
-        PRUnichar c1 = *s1++;
-        PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
-        if (c1 != c2) {
-          if (c1 < c2) return -1;
-          return 1;
-        }
-        if ((0==c1) || (0==c2)) break;
-      } while (--n != 0);
-    }
-  }
-  return 0;
-}
-
-/**
- * Compare a unichar string ptr to cstring without regard to case
- * NOTE: If both are null, we return 0.
- * @update  gess7/30/98
- * @param   s1 points to unichar string
- * @param   s2 points to cstring
- * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
- */
-PRInt32 nsCRT::strcasecmp(const PRUnichar* s1, const char* s2)
-{
-  if(s1 && s2) {
-    for (;;) {
-      PRUnichar c1 = *s1++;
-      PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
-      if (c1 != c2) {
-        c1 = TOLOWER(c1);
-        c2 = TOLOWER(c2);
-        if (c1 != c2) {
-          if (c1 < c2) return -1;
-          return 1;
-        }
-      }
-      if ((0==c1) || (0==c2)) break;
-    }
-  }
-  return 0;
-}
-
-/**
- * Caseless compare up to N chars between unichar string ptr to cstring.
- * NOTE: If both are null, we return 0.
- * @update  gess7/30/98
- * @param   s1 points to unichar string
- * @param   s2 points to cstring
- * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
- */
-PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const char* s2, PRUint32 n)
-{
-  if(s1 && s2){
-    if(n != 0){
-      do {
-        PRUnichar c1 = *s1++;
-        PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
-        if (c1 != c2) {
-          c1 = TOLOWER(c1);
-          c2 = TOLOWER(c2);
-          if (c1 != c2) {
-            if (c1 < c2) return -1;
-            return 1;
-          }
-        }
-        if (c1 == 0) break;
-      } while (--n != 0);
-    }
-  }
-  return 0;
-}
-
-PRUnichar* nsCRT::strdup(const PRUnichar* str)
-{
-  PRUint32 len = nsCRT::strlen(str) + 1; // add one for null
-
-
-	nsCppSharedAllocator<PRUnichar> shared_allocator;
-	PRUnichar* rslt = shared_allocator.allocate(len);
-  // PRUnichar* rslt = new PRUnichar[len];
-
-  if (rslt == NULL) return NULL;
-  nsCRT::memcpy(rslt, str, len * sizeof(PRUnichar));
-  return rslt;
-}
-
-PRUint32 nsCRT::HashValue(const char* us)
-{
-  PRUint32 rv = 0;
-  if(us) {
-    char ch;
-    while ((ch = *us++) != 0) {
-      // FYI: rv = rv*37 + ch
-      rv = ((rv << 5) + (rv << 2) + rv) + ch;
-    }
-  }
-  return rv;
-}
-
-PRUint32 nsCRT::HashValue(const char* us, PRUint32* uslenp)
-{
-  PRUint32 rv = 0;
-  PRUint32 len = 0;
-  char ch;
-  while ((ch = *us++) != 0) {
-    // FYI: rv = rv*37 + ch
-    rv = ((rv << 5) + (rv << 2) + rv) + ch;
-    len++;
-  }
-  *uslenp = len;
-  return rv;
-}
-
-PRUint32 nsCRT::HashValue(const PRUnichar* us)
-{
-  PRUint32 rv = 0;
-  if(us) {
-    PRUnichar ch;
-    while ((ch = *us++) != 0) {
-      // FYI: rv = rv*37 + ch
-      rv = ((rv << 5) + (rv << 2) + rv) + ch;
-    }
-  }
-  return rv;
-}
-
-PRUint32 nsCRT::HashValue(const PRUnichar* us, PRUint32* uslenp)
-{
-  PRUint32 rv = 0;
-  PRUint32 len = 0;
-  PRUnichar ch;
-  while ((ch = *us++) != 0) {
-    // FYI: rv = rv*37 + ch
-    rv = ((rv << 5) + (rv << 2) + rv) + ch;
-    len++;
-  }
-  *uslenp = len;
-  return rv;
-}
-
-PRInt32 nsCRT::atoi( const PRUnichar *string )
-{
-  return atoi(string);
-}
-

mozilla/xpcom/ds/nsCRT.h

@@ -1,239 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-#ifndef nsCRT_h___
-#define nsCRT_h___
-
-#include <stdlib.h>
-#include <string.h>
-#include "plstr.h"
-#include "nscore.h"
-#include "prtypes.h"
-#include "nsCppSharedAllocator.h"
-
-#define CR '\015'
-#define LF '\012'
-#define VTAB '\013'
-#define FF '\014'
-#define TAB '\011'
-#define CRLF "\015\012"     /* A CR LF equivalent string */
-
-#ifdef XP_MAC
-#  define NS_LINEBREAK             "\015"
-#  define NS_LINEBREAK_LEN 1
-#else
-#  ifdef XP_PC
-#    define NS_LINEBREAK           "\015\012"
-#    define NS_LINEBREAK_LEN       2
-#  else
-#    if defined(XP_UNIX) || defined(XP_BEOS)
-#      define NS_LINEBREAK         "\012"
-#      define NS_LINEBREAK_LEN     1
-#    endif /* XP_UNIX */
-#  endif /* XP_PC */
-#endif /* XP_MAC */
-
-
-extern const PRUnichar kIsoLatin1ToUCS2[256];
-
-
-// This macro can be used in a class declaration for classes that want
-// to ensure that their instance memory is zeroed.
-#define NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW \
-  void* operator new(size_t sz) {             \
-    void* rv = ::operator new(sz);            \
-    if (rv) {                                 \
-      nsCRT::zero(rv, sz);                    \
-    }                                         \
-    return rv;                                \
-  }                                           \
-  void operator delete(void* ptr) {           \
-    ::operator delete(ptr);                   \
-  }
-
-// This macro works with the next macro to declare a non-inlined
-// version of the above.
-#define NS_DECL_ZEROING_OPERATOR_NEW \
-  void* operator new(size_t sz);     \
-  void operator delete(void* ptr);
-
-#define NS_IMPL_ZEROING_OPERATOR_NEW(_class) \
-  void* _class::operator new(size_t sz) {    \
-    void* rv = ::operator new(sz);           \
-    if (rv) {                                \
-      nsCRT::zero(rv, sz);                   \
-    }                                        \
-    return rv;                               \
-  }                                          \
-  void _class::operator delete(void* ptr) {  \
-    ::operator delete(ptr);                  \
-  }
-
-// Freeing helper
-#define CRTFREEIF(x) if (x) { nsCRT::free(x); x = 0; }
-
-/// This is a wrapper class around all the C runtime functions. 
-
-class NS_COM nsCRT {
-public:
-
-  /** Copy bytes from aSrc to aDest.
-    @param aDest the destination address
-    @param aSrc the source address
-    @param aCount the number of bytes to copy
-    */
-  static void memcpy(void* aDest, const void* aSrc, PRUint32 aCount) {
-    ::memcpy(aDest, aSrc, (size_t)aCount);
-  }
-
-  static void memmove(void* aDest, const void* aSrc, PRUint32 aCount) {
-    ::memmove(aDest, aSrc, (size_t)aCount);
-  }
-
-  static void memset(void* aDest, PRUint8 aByte, PRUint32 aCount) {
-    ::memset(aDest, aByte, aCount);
-  }
-
-  static void zero(void* aDest, PRUint32 aCount) {
-    ::memset(aDest, 0, (size_t)aCount);
-  }
-
-  /** Compute the string length of s
-   @param s the string in question
-   @return the length of s
-   */
-  static PRUint32 strlen(const char* s) {
-    return PRUint32(::strlen(s));
-  }
-
-  /// Compare s1 and s2.
-  static PRInt32 strcmp(const char* s1, const char* s2) {
-    return PRUint32(PL_strcmp(s1, s2));
-  }
-
-  static PRInt32 strncmp(const char* s1, const char* s2,
-                         PRUint32 aMaxLen) {
-    return PRInt32(PL_strncmp(s1, s2, aMaxLen));
-  }
-
-  /// Case-insensitive string comparison.
-  static PRInt32 strcasecmp(const char* s1, const char* s2) {
-    return PRInt32(PL_strcasecmp(s1, s2));
-  }
-
-  /// Case-insensitive string comparison with length
-  static PRInt32 strncasecmp(const char* s1, const char* s2, PRUint32 aMaxLen) {
-    return PRInt32(PL_strncasecmp(s1, s2, aMaxLen));
-  }
-
-  static PRInt32 strncmp(const char* s1, const char* s2, PRInt32 aMaxLen) {
-    // inline the first test (assumes strings are not null):
-    PRInt32 diff = ((const unsigned char*)s1)[0] - ((const unsigned char*)s2)[0];
-    if (diff != 0) return diff;
-    return PRInt32(PL_strncmp(s1,s2,aMaxLen));
-  }
-  
-  static char* strdup(const char* str) {
-    return PL_strdup(str);
-  }
-
-  static void free(char* str) {
-    PL_strfree(str);
-  }
-
-  /**
-
-    How to use this fancy (thread-safe) version of strtok: 
-
-    void main( void ) {
-      printf( "%s\n\nTokens:\n", string );
-      // Establish string and get the first token:
-      char* newStr;
-      token = nsCRT::strtok( string, seps, &newStr );   
-      while( token != NULL ) {
-        // While there are tokens in "string"
-        printf( " %s\n", token );
-        // Get next token:
-        token = nsCRT::strtok( newStr, seps, &newStr );
-      }
-    }
-    * WARNING - STRTOK WHACKS str THE FIRST TIME IT IS CALLED *
-    * MAKE A COPY OF str IF YOU NEED TO USE IT AFTER strtok() *
-  */
-  static char* strtok(char* str, const char* delims, char* *newStr); 
-
-  /// Like strlen except for ucs2 strings
-  static PRUint32 strlen(const PRUnichar* s);
-
-  /// Like strcmp except for ucs2 strings
-  static PRInt32 strcmp(const PRUnichar* s1, const PRUnichar* s2);
-  /// Like strcmp except for ucs2 strings
-  static PRInt32 strncmp(const PRUnichar* s1, const PRUnichar* s2,
-                         PRUint32 aMaxLen);
-
-  /// Like strcasecmp except for ucs2 strings
-  static PRInt32 strcasecmp(const PRUnichar* s1, const PRUnichar* s2);
-  /// Like strncasecmp except for ucs2 strings
-  static PRInt32 strncasecmp(const PRUnichar* s1, const PRUnichar* s2,
-                             PRUint32 aMaxLen);
-
-  /// Like strcmp with a char* and a ucs2 string
-  static PRInt32 strcmp(const PRUnichar* s1, const char* s2);
-  /// Like strncmp with a char* and a ucs2 string
-  static PRInt32 strncmp(const PRUnichar* s1, const char* s2,
-                         PRUint32 aMaxLen);
-
-  /// Like strcasecmp with a char* and a ucs2 string
-  static PRInt32 strcasecmp(const PRUnichar* s1, const char* s2);
-  /// Like strncasecmp with a char* and a ucs2 string
-  static PRInt32 strncasecmp(const PRUnichar* s1, const char* s2,
-                             PRUint32 aMaxLen);
-
-  // Note: uses new[] to allocate memory, so you must use delete[] to
-  // free the memory
-  static PRUnichar* strdup(const PRUnichar* str);
-
-  static void free(PRUnichar* str) {
-  	nsCppSharedAllocator<PRUnichar> shared_allocator;
-  	shared_allocator.deallocate(str, 0 /*we never new or kept the size*/);
-  }
-
-  /// Compute a hashcode for a C string
-  static PRUint32 HashValue(const char* s1);
-
-  /// Same as above except that we return the length in s1len
-  static PRUint32 HashValue(const char* s1, PRUint32* s1len);
-
-  /// Compute a hashcode for a ucs2 string
-  static PRUint32 HashValue(const PRUnichar* s1);
-
-  /// Same as above except that we return the length in s1len
-  static PRUint32 HashValue(const PRUnichar* s1, PRUint32* s1len);
-
-  /// String to integer.
-  static PRInt32 atoi( const PRUnichar *string );
-  
-  static PRUnichar ToUpper(PRUnichar aChar);
-
-  static PRUnichar ToLower(PRUnichar aChar);
-  
-  static PRBool IsUpper(PRUnichar aChar);
-
-  static PRBool IsLower(PRUnichar aChar);
-};
-
-#endif /* nsCRT_h___ */

mozilla/xpcom/ds/nsConjoiningEnumerator.cpp

@@ -1,365 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsIEnumerator.h"
-
-////////////////////////////////////////////////////////////////////////////////
-// Intersection Enumerators
-////////////////////////////////////////////////////////////////////////////////
-
-class nsConjoiningEnumerator : public nsIBidirectionalEnumerator
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  // nsIEnumerator methods:
-  NS_DECL_NSIENUMERATOR
-
-  // nsIBidirectionalEnumerator methods:
-  NS_DECL_NSIBIDIRECTIONALENUMERATOR
-
-  // nsConjoiningEnumerator methods:
-  nsConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second);
-  virtual ~nsConjoiningEnumerator(void);
-
-protected:
-  nsIEnumerator* mFirst;
-  nsIEnumerator* mSecond;
-  nsIEnumerator* mCurrent;
-};
-
-nsConjoiningEnumerator::nsConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second)
-  : mFirst(first), mSecond(second), mCurrent(first)
-{
-  NS_ADDREF(mFirst);
-  NS_ADDREF(mSecond);
-}
-
-nsConjoiningEnumerator::~nsConjoiningEnumerator(void)
-{
-  NS_RELEASE(mFirst);
-  NS_RELEASE(mSecond);
-}
-
-NS_IMPL_ISUPPORTS2(nsConjoiningEnumerator, nsIBidirectionalEnumerator, nsIEnumerator)
-
-NS_IMETHODIMP 
-nsConjoiningEnumerator::First(void)
-{
-  mCurrent = mFirst;
-  return mCurrent->First();
-}
-
-NS_IMETHODIMP 
-nsConjoiningEnumerator::Next(void)
-{
-  nsresult rv = mCurrent->Next();
-  if (NS_FAILED(rv) && mCurrent == mFirst) {
-    mCurrent = mSecond;
-    rv = mCurrent->First();
-  }
-  return rv;
-}
-
-NS_IMETHODIMP 
-nsConjoiningEnumerator::CurrentItem(nsISupports **aItem)
-{
-  return mCurrent->CurrentItem(aItem);
-}
-
-NS_IMETHODIMP 
-nsConjoiningEnumerator::IsDone(void)
-{
-  return (mCurrent == mFirst && mCurrent->IsDone() == NS_OK)
-      || (mCurrent == mSecond && mCurrent->IsDone() == NS_OK)
-    ? NS_OK : NS_COMFALSE;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-NS_IMETHODIMP 
-nsConjoiningEnumerator::Last(void)
-{
-  nsresult rv;
-  nsIBidirectionalEnumerator* be;
-  rv = mSecond->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
-  if (NS_FAILED(rv)) return rv;
-  mCurrent = mSecond;
-  rv = be->Last();
-  NS_RELEASE(be);
-  return rv;
-}
-
-NS_IMETHODIMP 
-nsConjoiningEnumerator::Prev(void)
-{
-  nsresult rv;
-  nsIBidirectionalEnumerator* be;
-  rv = mCurrent->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
-  if (NS_FAILED(rv)) return rv;
-  rv = be->Prev();
-  NS_RELEASE(be);
-  if (NS_FAILED(rv) && mCurrent == mSecond) {
-    rv = mFirst->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
-    if (NS_FAILED(rv)) return rv;
-    mCurrent = mFirst;
-    rv = be->Last();
-    NS_RELEASE(be);
-  }  
-  return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-extern "C" NS_COM nsresult
-NS_NewConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second,
-                           nsIBidirectionalEnumerator* *aInstancePtrResult)
-{
-  if (aInstancePtrResult == 0)
-    return NS_ERROR_NULL_POINTER;
-  nsConjoiningEnumerator* e = new nsConjoiningEnumerator(first, second);
-  if (e == 0)
-    return NS_ERROR_OUT_OF_MEMORY;
-  NS_ADDREF(e);
-  *aInstancePtrResult = e;
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-static nsresult
-nsEnumeratorContains(nsIEnumerator* e, nsISupports* item)
-{
-  nsresult rv;
-  for (e->First(); e->IsDone() != NS_OK; e->Next()) {
-    nsISupports* other;
-    rv = e->CurrentItem(&other);
-    if (NS_FAILED(rv)) return rv;
-    if (item == other) {
-      NS_RELEASE(other);
-      return NS_OK;     // true -- exists in enumerator
-    }
-    NS_RELEASE(other);
-  }
-  return NS_COMFALSE;   // false -- doesn't exist
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Intersection Enumerators
-////////////////////////////////////////////////////////////////////////////////
-
-class nsIntersectionEnumerator : public nsIEnumerator
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  // nsIEnumerator methods:
-  NS_DECL_NSIENUMERATOR
-
-  // nsIntersectionEnumerator methods:
-  nsIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second);
-  virtual ~nsIntersectionEnumerator(void);
-
-protected:
-  nsIEnumerator* mFirst;
-  nsIEnumerator* mSecond;
-};
-
-nsIntersectionEnumerator::nsIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second)
-  : mFirst(first), mSecond(second)
-{
-  NS_ADDREF(mFirst);
-  NS_ADDREF(mSecond);
-}
-
-nsIntersectionEnumerator::~nsIntersectionEnumerator(void)
-{
-  NS_RELEASE(mFirst);
-  NS_RELEASE(mSecond);
-}
-
-NS_IMPL_ISUPPORTS1(nsIntersectionEnumerator, nsIEnumerator)
-
-NS_IMETHODIMP 
-nsIntersectionEnumerator::First(void)
-{
-  nsresult rv = mFirst->First();
-  if (NS_FAILED(rv)) return rv;
-  return Next();
-}
-
-NS_IMETHODIMP 
-nsIntersectionEnumerator::Next(void)
-{
-  nsresult rv;
-
-  // find the first item that exists in both
-  for (; mFirst->IsDone() != NS_OK; mFirst->Next()) {
-    nsISupports* item;
-    rv = mFirst->CurrentItem(&item);
-    if (NS_FAILED(rv)) return rv;
-
-    // see if it also exists in mSecond
-    rv = nsEnumeratorContains(mSecond, item);
-    if (NS_FAILED(rv)) return rv;
-
-    NS_RELEASE(item);
-    if (rv == NS_OK) {
-      // found in both, so return leaving it as the current item of mFirst
-      return NS_OK;
-    }
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP 
-nsIntersectionEnumerator::CurrentItem(nsISupports **aItem)
-{
-  return mFirst->CurrentItem(aItem);
-}
-
-NS_IMETHODIMP 
-nsIntersectionEnumerator::IsDone(void)
-{
-  return mFirst->IsDone();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-extern "C" NS_COM nsresult
-NS_NewIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
-                      nsIEnumerator* *aInstancePtrResult)
-{
-  if (aInstancePtrResult == 0)
-    return NS_ERROR_NULL_POINTER;
-  nsIntersectionEnumerator* e = new nsIntersectionEnumerator(first, second);
-  if (e == 0)
-    return NS_ERROR_OUT_OF_MEMORY;
-  NS_ADDREF(e);
-  *aInstancePtrResult = e;
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Union Enumerators
-////////////////////////////////////////////////////////////////////////////////
-
-class nsUnionEnumerator : public nsIEnumerator
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  // nsIEnumerator methods:
-  NS_DECL_NSIENUMERATOR
-
-  // nsUnionEnumerator methods:
-  nsUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second);
-  virtual ~nsUnionEnumerator(void);
-
-protected:
-  nsIEnumerator* mFirst;
-  nsIEnumerator* mSecond;
-};
-
-nsUnionEnumerator::nsUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second)
-  : mFirst(first), mSecond(second)
-{
-  NS_ADDREF(mFirst);
-  NS_ADDREF(mSecond);
-}
-
-nsUnionEnumerator::~nsUnionEnumerator(void)
-{
-  NS_RELEASE(mFirst);
-  NS_RELEASE(mSecond);
-}
-
-NS_IMPL_ISUPPORTS1(nsUnionEnumerator, nsIEnumerator)
-
-NS_IMETHODIMP 
-nsUnionEnumerator::First(void)
-{
-  nsresult rv = mFirst->First();
-  if (NS_FAILED(rv)) return rv;
-  return Next();
-}
-
-NS_IMETHODIMP 
-nsUnionEnumerator::Next(void)
-{
-  nsresult rv;
-
-  // find the first item that exists in both
-  for (; mFirst->IsDone() != NS_OK; mFirst->Next()) {
-    nsISupports* item;
-    rv = mFirst->CurrentItem(&item);
-    if (NS_FAILED(rv)) return rv;
-
-    // see if it also exists in mSecond
-    rv = nsEnumeratorContains(mSecond, item);
-    if (NS_FAILED(rv)) return rv;
-
-    NS_RELEASE(item);
-    if (rv != NS_OK) {
-      // if it didn't exist in mSecond, return, making it the current item
-      return NS_OK;
-    }
-    
-    // each time around, make sure that mSecond gets reset to the beginning
-    // so that when mFirst is done, we'll be ready to enumerate mSecond
-    rv = mSecond->First();
-    if (NS_FAILED(rv)) return rv;
-  }
-  
-  return mSecond->Next();
-}
-
-NS_IMETHODIMP 
-nsUnionEnumerator::CurrentItem(nsISupports **aItem)
-{
-  if (mFirst->IsDone() != NS_OK)
-    return mFirst->CurrentItem(aItem);
-  else
-    return mSecond->CurrentItem(aItem);
-}
-
-NS_IMETHODIMP 
-nsUnionEnumerator::IsDone(void)
-{
-  return (mFirst->IsDone() == NS_OK && mSecond->IsDone() == NS_OK)
-    ? NS_OK : NS_COMFALSE;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-extern "C" NS_COM nsresult
-NS_NewUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
-                      nsIEnumerator* *aInstancePtrResult)
-{
-  if (aInstancePtrResult == 0)
-    return NS_ERROR_NULL_POINTER;
-  nsUnionEnumerator* e = new nsUnionEnumerator(first, second);
-  if (e == 0)
-    return NS_ERROR_OUT_OF_MEMORY;
-  NS_ADDREF(e);
-  *aInstancePtrResult = e;
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/xpcom/ds/nsCppSharedAllocator.h

@@ -1,122 +0,0 @@
-#ifndef nsCppSharedAllocator_h__
-#define nsCppSharedAllocator_h__
-
-#include "nsIAllocator.h" // for |nsAllocator|
-#include "nscore.h"       // for |NS_XXX_CAST|
-#include <new.h>					// to allow placement |new|
-
-
-  // under Metrowerks (Mac), we don't have autoconf yet
-#ifdef __MWERKS__
-  #define HAVE_CPP_MEMBER_TEMPLATES
-	#define HAVE_CPP_NUMERIC_LIMITS
-#endif
-
-#ifdef HAVE_CPP_NUMERIC_LIMITS
-#include <limits>
-#else
-#include <limits.h>
-#endif
-
-
-template <class T>
-class nsCppSharedAllocator
-    /*
-      ...allows Standard Library containers, et al, to use our global shared
-      (XP)COM-aware allocator.
-    */
-  {
-    public:
-      typedef T          value_type;
-      typedef size_t     size_type;
-      typedef ptrdiff_t  difference_type;
-
-      typedef T*         pointer;
-      typedef const T*   const_pointer;
-
-      typedef T&         reference;
-      typedef const T&   const_reference;
-
-
-
-      nsCppSharedAllocator() { }
-
-#ifdef HAVE_CPP_MEMBER_TEMPLATES
-      template <class U>
-      nsCppSharedAllocator( const nsCppSharedAllocator<U>& ) { }
-#endif
-
-     ~nsCppSharedAllocator() { }
-
-
-      pointer
-      address( reference r ) const
-        {
-          return &r;
-        }
-
-      const_pointer
-      address( const_reference r ) const
-        {
-          return &r;
-        }
-
-      pointer
-      allocate( size_type n, const void* /*hint*/=0 )
-        {
-          return NS_REINTERPRET_CAST(pointer, nsAllocator::Alloc(NS_STATIC_CAST(PRUint32, n*sizeof(T))));
-        }
-
-      void
-      deallocate( pointer p, size_type /*n*/ )
-        {
-          nsAllocator::Free(p);
-        }
-
-      void
-      construct( pointer p, const T& val )
-        {
-          new (p) T(val);
-        }
-      
-      void
-      destroy( pointer p )
-        {
-          p->~T();
-        }
-
-      size_type
-      max_size() const
-        {
-#ifdef HAVE_CPP_NUMERIC_LIMITS
-          return numeric_limits<size_type>::max() / sizeof(T);
-#else
-          return ULONG_MAX / sizeof(T);
-#endif
-        }
-
-#ifdef HAVE_CPP_MEMBER_TEMPLATES
-      template <class U>
-      struct rebind
-        {
-          typedef nsCppSharedAllocator<U> other;
-        };
-#endif
-  };
-
-
-template <class T>
-PRBool
-operator==( const nsCppSharedAllocator<T>&, const nsCppSharedAllocator<T>& )
-  {
-    return PR_TRUE;
-  }
-
-template <class T>
-PRBool
-operator!=( const nsCppSharedAllocator<T>&, const nsCppSharedAllocator<T>& )
-  {
-    return PR_FALSE;
-  }
-
-#endif /* !defined(nsCppSharedAllocator_h__) */

mozilla/xpcom/ds/nsDeque.cpp

@@ -1,594 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
- 
-#include "nsDeque.h"
-#include "nsCRT.h"
-#include <stdio.h>
-
-//#define _SELFTEST_DEQUE 1
-#undef _SELFTEST_DEQUE 
-
-/**
- * Standard constructor
- * @update	gess4/18/98
- * @return  new deque
- */
-nsDeque::nsDeque(nsDequeFunctor* aDeallocator) {
-  mDeallocator=aDeallocator;
-  mOrigin=mSize=0;
-  mData=mBuffer; // don't allocate space until you must
-  mCapacity=sizeof(mBuffer)/sizeof(mBuffer[0]);
-  nsCRT::zero(mData,mCapacity*sizeof(mBuffer[0]));
-}
-
-
-/**
- * Destructor
- * @update	gess4/18/98
- */
-nsDeque::~nsDeque() {
-
-#if 0
-  char buffer[30];
-  printf("Capacity: %i\n",mCapacity);
-
-  static int mCaps[15] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-  switch(mCapacity) {
-    case 4:     mCaps[0]++; break;
-    case 8:     mCaps[1]++; break;
-    case 16:    mCaps[2]++; break;
-    case 32:    mCaps[3]++; break;
-    case 64:    mCaps[4]++; break;
-    case 128:   mCaps[5]++; break;
-    case 256:   mCaps[6]++; break;
-    case 512:   mCaps[7]++; break;
-    case 1024:  mCaps[8]++; break;
-    case 2048:  mCaps[9]++; break;
-    case 4096:  mCaps[10]++; break;
-    default:
-      break;
-  }
-#endif
-
-  Erase();
-  if(mData && (mData!=mBuffer))
-    delete [] mData;
-  mData=0;
-  if(mDeallocator) {
-    delete mDeallocator;
-  }
-  mDeallocator=0;
-}
-
-
-/**
- *
- * @update	gess4/18/98
- * @param 
- * @return  
- */ 
-void nsDeque::SetDeallocator(nsDequeFunctor* aDeallocator){
-  if(mDeallocator) {
-    delete mDeallocator;
-  }
-  mDeallocator=aDeallocator;
-}
-
-/**
- * Remove all items from container without destroying them.
- *
- * @update	gess4/18/98
- * @param 
- * @return
- */
-nsDeque& nsDeque::Empty() {
-  if((0<mCapacity) && (mData)) {
-    nsCRT::zero(mData,mCapacity*sizeof(mData));
-  }
-  mSize=0;
-  mOrigin=0;
-  return *this;
-}
-
-/**
- * Remove and delete all items from container
- * 
- * @update	gess4/18/98
- * @return  this
- */
-nsDeque& nsDeque::Erase() { 
-  if(mDeallocator && mSize) {
-    ForEach(*mDeallocator);
-  }
-  return Empty();
-}
-
-
-/**
- * This method adds an item to the end of the deque. 
- * This operation has the potential to cause the 
- * underlying buffer to resize.
- *
- * @update	gess4/18/98
- * @param   anItem: new item to be added to deque
- * @return  nada
- */
-nsDeque& nsDeque::GrowCapacity(void) {
-
-  PRInt32 theNewSize = mCapacity<<2;
-  void** temp=new void*[theNewSize];
-
-  //Here's the interesting part: You can't just move the elements
-  //directy (in situ) from the old buffer to the new one.
-  //Since capacity has changed, the old origin doesn't make
-  //sense anymore. It's better to resequence the elements now.
-
-  if(mData) {
-    int tempi=0;
-    int i=0;
-    int j=0;
-    for(i=mOrigin;i<mCapacity;i++) temp[tempi++]=mData[i]; //copy the leading elements...
-    for(j=0;j<mOrigin;j++) temp[tempi++]=mData[j];         //copy the trailing elements...
-    if(mData!=mBuffer)
-      delete [] mData;
-  }
-  mCapacity=theNewSize;
-  mOrigin=0;       //now realign the origin...
-  mData=temp;
-  return *this;
-}
-
-/**
- * This method adds an item to the end of the deque. 
- * This operation has the potential to cause the 
- * underlying buffer to resize.
- *
- * @update	gess4/18/98
- * @param   anItem: new item to be added to deque
- * @return  nada
- */
-nsDeque& nsDeque::Push(void* anItem) {
-  if(mSize==mCapacity) {
-    GrowCapacity();
-  }
-  int offset=mOrigin+mSize;
-  if(offset<mCapacity)
-    mData[offset]=anItem;
-  else mData[offset-mCapacity]=anItem;
-  mSize++;
-  return *this;
-}
-
-/**
- * This method adds an item to the front of the deque. 
- * This operation has the potential to cause the 
- * underlying buffer to resize.
- *
- * @update	gess4/18/98
- * @param   anItem: new item to be added to deque
- * @return  nada
- */
-nsDeque& nsDeque::PushFront(void* anItem) {
-  if(mSize==mCapacity) {
-    GrowCapacity();
-  }
-  if(0==mOrigin){  //case1: [xxx..]
-    //mOrigin=mCapacity-1-mSize++;
-    mOrigin=mCapacity-1;
-    mData[mOrigin]=anItem;
-  }
-  else {// if(mCapacity==(mOrigin+mSize-1)){ //case2: [..xxx] and case3: [.xxx.]
-    mData[--mOrigin]=anItem;
-  }
-  mSize++;
-  return *this;
-}
-
-/**
- * Remove and return the last item in the container.
- * 
- * @update	gess4/18/98
- * @param   none
- * @return  ptr to last item in container
- */
-void* nsDeque::Pop(void) {
-  void* result=0;
-  if(mSize>0) {
-    int offset=mOrigin+mSize-1;
-    if(offset>=mCapacity) 
-      offset-=mCapacity;
-    result=mData[offset];
-    mData[offset]=0;
-    mSize--;
-    if(0==mSize)
-      mOrigin=0;
-  }
-  return result;
-}
-
-/**
- * This method gets called you want to remove and return
- * the first member in the container.
- *
- * @update	gess4/18/98
- * @param   nada
- * @return  last item in container
- */
-void* nsDeque::PopFront() {
-  void* result=0;
-  if(mSize>0) {
-    NS_ASSERTION(mOrigin<mCapacity,"Error: Bad origin");
-    result=mData[mOrigin];
-    mData[mOrigin++]=0;     //zero it out for debugging purposes.
-    mSize--;
-    if(mCapacity==mOrigin)  //you popped off the end, so cycle back around...
-      mOrigin=0;
-    if(0==mSize)
-      mOrigin=0;
-  }
-  return result;
-}
-
-/**
- * This method gets called you want to peek at the topmost
- * member without removing it.
- *
- * @update	gess4/18/98
- * @param   nada
- * @return  last item in container
- */
-void* nsDeque::Peek() {
-  void* result=0;
-  if(mSize>0) {
-    result=mData[mOrigin];
-  }
-  return result;
-}
-
-/**
- * Call this to retrieve the ith element from this container.
- * Keep in mind that accessing the underlying elements is 
- * done in a relative fashion. Object 0 is not necessarily
- * the first element (the first element is at mOrigin).
- *
- * @update	gess4/18/98
- * @param   anIndex : 0 relative offset of item you want
- * @return  void* or null
- */
-void* nsDeque::ObjectAt(PRInt32 anIndex) const {
-  void* result=0;
-
-  if((anIndex>=0) && (anIndex<mSize))
-  {
-    if(anIndex<(mCapacity-mOrigin)) {
-      result=mData[mOrigin+anIndex];
-    }
-    else {
-      result=mData[anIndex-(mCapacity-mOrigin)];
-    }
-  }
-  return result;
-}
-
-/**
- * Create and return an iterator pointing to
- * the beginning of the queue. Note that this
- * takes the circular buffer semantics into account.
- * 
- * @update	gess4/18/98
- * @return  new deque iterator, init'ed to 1st item
- */
-nsDequeIterator nsDeque::Begin(void) const{
-  return nsDequeIterator(*this,0);
-}
-
-/**
- * Create and return an iterator pointing to
- * the last of the queue. Note that this
- * takes the circular buffer semantics into account.
- * 
- * @update	gess4/18/98
- * @return  new deque iterator, init'ed to last item
- */
-nsDequeIterator nsDeque::End(void) const{
-  return nsDequeIterator(*this,mSize);
-}
-
-/**
- * Call this method when you wanto to iterate all the
- * members of the container, passing a functor along
- * to call your code.
- *
- * @update	gess4/20/98
- * @param   aFunctor object to call for each member
- * @return  *this
- */
-void nsDeque::ForEach(nsDequeFunctor& aFunctor) const{
-  int i=0;
-  for(i=0;i<mSize;i++){
-    void* obj=ObjectAt(i);
-    obj=aFunctor(obj);
-  }
-}
-
-/**
- * Call this method when you wanto to iterate all the
- * members of the container, passing a functor along
- * to call your code. Iteration continues until your
- * functor returns a non-null.
- *
- * @update	gess4/20/98
- * @param   aFunctor object to call for each member
- * @return  *this
- */
-const void* nsDeque::FirstThat(nsDequeFunctor& aFunctor) const{
-  int i=0;
-  for(i=0;i<mSize;i++){
-    void* obj=ObjectAt(i);
-    obj=aFunctor(obj);
-    if(obj)
-      return obj;
-  }
-  return 0;
-}
-
-
-/******************************************************
- * Here comes the nsDequeIterator class...
- ******************************************************/
-
-/**
- * DequeIterator is an object that knows how to iterate (forward and backward)
- * a Deque. Normally, you don't need to do this, but there are some special
- * cases where it is pretty handy, so here you go.
- *
- * This is a standard dequeiterator constructor
- *
- * @update	gess4/18/98
- * @param   aQueue is the deque object to be iterated
- * @param   anIndex is the starting position for your iteration
- */
-nsDequeIterator::nsDequeIterator(const nsDeque& aQueue,int anIndex):  mIndex(anIndex), mDeque(aQueue) {
-}
-
-/**
- * Copy construct a new iterator beginning with given 
- *
- * @update	gess4/20/98
- * @param   aCopy is another iterator to copy from
- * @return
- */
-nsDequeIterator::nsDequeIterator(const nsDequeIterator& aCopy) : mIndex(aCopy.mIndex), mDeque(aCopy.mDeque) {
-}
-
-/**
- * Moves iterator to first element in deque
- * @update	gess4/18/98
- * @return  this
- */
-nsDequeIterator& nsDequeIterator::First(void){
-  mIndex=0;
-  return *this;
-}
-
-/**
- * Standard assignment operator for dequeiterator
- *
- * @update	gess4/18/98
- * @param   aCopy is an iterator to be copied from
- * @return  *this
- */
-nsDequeIterator& nsDequeIterator::operator=(const nsDequeIterator& aCopy) {
-  //queue's are already equal.
-  mIndex=aCopy.mIndex;
-  return *this;
-}
-
-/**
- * preform ! operation against to iterators to test for equivalence
- * (or lack thereof)!
- *
- * @update	gess4/18/98
- * @param   anIter is the object to be compared to
- * @return  TRUE if NOT equal.
- */
-PRBool nsDequeIterator::operator!=(nsDequeIterator& anIter) {
-  return PRBool(!this->operator==(anIter));
-}
-
-
-/**
- * Compare 2 iterators for equivalence.
- *
- * @update	gess4/18/98
- * @param   anIter is the other iterator to be compared to
- * @return  TRUE if EQUAL
- */
-PRBool nsDequeIterator::operator<(nsDequeIterator& anIter) {
-  return PRBool(((mIndex<anIter.mIndex) && (&mDeque==&anIter.mDeque)));
-}
-
-/**
- * Compare 2 iterators for equivalence.
- *
- * @update	gess4/18/98
- * @param   anIter is the other iterator to be compared to
- * @return  TRUE if EQUAL
- */
-PRBool nsDequeIterator::operator==(nsDequeIterator& anIter) {
-  return PRBool(((mIndex==anIter.mIndex) && (&mDeque==&anIter.mDeque)));
-}
-
-/**
- * Compare 2 iterators for equivalence.
- *
- * @update	gess4/18/98
- * @param   anIter is the other iterator to be compared to
- * @return  TRUE if EQUAL
- */
-PRBool nsDequeIterator::operator>=(nsDequeIterator& anIter) {
-  return PRBool(((mIndex>=anIter.mIndex) && (&mDeque==&anIter.mDeque)));
-}
-
-/**
- * Pre-increment operator 
- *
- * @update	gess4/18/98
- * @return  object at preincremented index
- */
-void* nsDequeIterator::operator++() {
-  return mDeque.ObjectAt(++mIndex);
-}
-
-/**
- * Post-increment operator 
- *
- * @update	gess4/18/98
- * @param   param is ignored
- * @return  object at post-incremented index
- */
-void* nsDequeIterator::operator++(int) {
-  return mDeque.ObjectAt(mIndex++);
-}
-
-/**
- * Pre-decrement operator
- *
- * @update	gess4/18/98
- * @return  object at pre-decremented index
- */
-void* nsDequeIterator::operator--() {
-  return mDeque.ObjectAt(--mIndex);
-}
-
-/**
- * Post-decrement operator
- *
- * @update	gess4/18/98
- * @param   param is ignored
- * @return  object at post-decremented index
- */
-void* nsDequeIterator::operator--(int) {
-  return mDeque.ObjectAt(mIndex--);
-}
-
-/**
- * Dereference operator
- *
- * @update	gess4/18/98
- * @return  object at ith index
- */
-void* nsDequeIterator::GetCurrent(void) {
-  return mDeque.ObjectAt(mIndex);
-}
-
-/**
- * Call this method when you wanto to iterate all the
- * members of the container, passing a functor along
- * to call your code.
- *
- * @update	gess4/20/98
- * @param   aFunctor object to call for each member
- * @return  *this
- */
-void nsDequeIterator::ForEach(nsDequeFunctor& aFunctor) const{
-  mDeque.ForEach(aFunctor);
-}
-
-/**
- * Call this method when you wanto to iterate all the
- * members of the container, passing a functor along
- * to call your code.
- *
- * @update	gess4/20/98
- * @param   aFunctor object to call for each member
- * @return  *this
- */
-const void* nsDequeIterator::FirstThat(nsDequeFunctor& aFunctor) const{
-  return mDeque.FirstThat(aFunctor);
-}
-
-#ifdef  _SELFTEST_DEQUE
-/**************************************************************
-  Now define the token deallocator class...
- **************************************************************/
-class _SelfTestDeallocator: public nsDequeFunctor{
-public:
-  _SelfTestDeallocator::_SelfTestDeallocator() {
-    nsDeque::SelfTest();
-  }
-  virtual void* operator()(void* anObject) {
-    return 0;
-  }
-};
-static _SelfTestDeallocator gDeallocator;
-#endif
-
-/**
- * conduct automated self test for this class
- *
- * @update	gess4/18/98
- * @param 
- * @return
- */
-void nsDeque::SelfTest(void) {
-#ifdef  _SELFTEST_DEQUE
-
-  {
-    nsDeque theDeque(gDeallocator); //construct a simple one...
-    
-    int ints[200];
-    int count=sizeof(ints)/sizeof(int);
-    int i=0;
-
-    for(i=0;i<count;i++){ //initialize'em
-      ints[i]=10*(1+i);
-    }
-
-    for(i=0;i<70;i++){
-      theDeque.Push(&ints[i]);
-    }
-
-    for(i=0;i<56;i++){
-      int* temp=(int*)theDeque.Pop();
-    }
-
-    for(i=0;i<55;i++){
-      theDeque.Push(&ints[i]);
-    }
-
-    for(i=0;i<35;i++){
-      int* temp=(int*)theDeque.Pop();
-    }
-
-    for(i=0;i<35;i++){
-      theDeque.Push(&ints[i]);
-    }
-
-    for(i=0;i<38;i++){
-      int* temp=(int*)theDeque.Pop();
-    }
-
-  }
-
-  int x;
-  x=10;
-#endif
-}
-

mozilla/xpcom/ds/nsDeque.h

@@ -1,410 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-/**
- * MODULE NOTES:
- * @update  gess 4/15/98 (tax day)
- * 
- * The Deque is a very small, very efficient container object
- * than can hold elements of type void*, offering the following features:
- *    It's interface supports pushing and poping of children.
- *    It can iterate (via an interator class) it's children.
- *    When full, it can efficently resize dynamically.
- *
- *
- * NOTE: The only bit of trickery here is that this deque is
- * built upon a ring-buffer. Like all ring buffers, the first 
- * element may not be at index[0]. The mOrigin member determines 
- * where the first child is. This point is quietly hidden from 
- * customers of this class.
- *    
- */
-
-
-#ifndef _NSDEQUE
-#define _NSDEQUE
-
-#include "nscore.h"
-
-/**
- * The nsDequefunctor class is used when you want to create
- * callbacks between the deque and your generic code.
- * Use these objects in a call to ForEach();
- *
- * @update	gess4/20/98
- */
-class NS_COM nsDequeFunctor{
-public:
-  virtual void* operator()(void* anObject)=0;
-};
-
-
-/******************************************************
- * Here comes the nsDeque class itself...
- ******************************************************/
-
-/**
- * The deque (double-ended queue) class is a common container type, 
- * whose behavior mimics a line in your favorite checkout stand.
- * Classic CS describes the common behavior of a queue as FIFO. 
- * A Deque allows items to be added and removed from either end of
- * the queue.
- *
- * @update	gess4/20/98
- */
-
-class NS_COM nsDeque {
-friend class nsDequeIterator;
-  public:
-                       nsDeque(nsDequeFunctor* aDeallocator);
-                      ~nsDeque();
-            
-  /**
-   * Returns the number of elements currently stored in
-   * this deque.
-   *
-   * @update	gess4/18/98
-   * @param 
-   * @return  int contains element count
-   */
-  inline PRInt32 GetSize() const { return mSize;}  
-
-  /**
-   * Pushes new member onto the end of the deque
-   *
-   * @update	gess4/18/98
-   * @param   ptr to object to store
-   * @return  *this
-   */
-  nsDeque& Push(void* anItem);
-
-  /**
-   * Pushes new member onto the front of the deque
-   *
-   * @update	gess4/18/98
-   * @param   ptr to object to store
-   * @return  *this
-   */
-  nsDeque& PushFront(void* anItem);
-  
-  /**
-   * Remove and return the first item in the container.
-   * 
-   * @update	gess4/18/98
-   * @param   none
-   * @return  ptr to first item in container
-   */
-  void* Pop(void);
-
- /**
-   * Remove and return the first item in the container.
-   * 
-   * @update	gess4/18/98
-   * @param   none
-   * @return  ptr to first item in container
-   */
-  void* PopFront(void);
-
- 
-  /**
-   * Return topmost item without removing it.
-   * 
-   * @update	gess4/18/98
-   * @param   none
-   * @return  ptr to first item in container
-   */
-  void* Peek(void);
-  
-  /**
-   * method used to retrieve ptr to
-   * ith member in container. DOesn't remove
-   * that item.
-   *
-   * @update	gess4/18/98
-   * @param   index of desired item
-   * @return  ptr to ith element in list
-   */
-  void* ObjectAt(int anIndex) const;
-  
-  /**
-   * Remove all items from container without destroying them
-   * 
-   * @update	gess4/18/98
-   * @param 
-   * @return
-   */
-  nsDeque& Empty();
-  
-  /**
-   * Remove and delete all items from container
-   * 
-   * @update	gess4/18/98
-   * @param 
-   * @return
-   */
-  nsDeque& Erase();
-
-
-  /**
-   * Creates a new iterator, init'ed to start of container
-   *
-   * @update	gess4/18/98
-   * @return  new dequeIterator
-   */
-  nsDequeIterator Begin() const;
-  
-  /**
-   * Creates a new iterator, init'ed to end of container
-   *
-   * @update	gess4/18/98
-   * @return  new dequeIterator
-   */
-  nsDequeIterator End() const;
-
-
-  /**
-   * Call this method when you wanto to iterate all the
-   * members of the container, passing a functor along
-   * to call your code.
-   *
-   * @update	gess4/20/98
-   * @param   aFunctor object to call for each member
-   * @return  *this
-   */
-  void ForEach(nsDequeFunctor& aFunctor) const;
-
-  /**
-   * Call this method when you wanto to iterate all the
-   * members of the container, passing a functor along
-   * to call your code. This process will interupt if
-   * your function returns a null to this iterator.
-   *
-   * @update	gess4/20/98
-   * @param   aFunctor object to call for each member
-   * @return  *this
-   */
-  const void* FirstThat(nsDequeFunctor& aFunctor) const;
-
-  void SetDeallocator(nsDequeFunctor* aDeallocator);
-
-  /**
-   * Perform automated selftest on the deque
-   *
-   * @update	gess4/18/98
-   * @param 
-   * @return
-   */
-  static void SelfTest();
-
-protected:
-
-  PRInt32         mSize;
-  PRInt32         mCapacity;
-  PRInt32         mOrigin;
-  nsDequeFunctor* mDeallocator;
-  void*           mBuffer[8];
-  void**          mData;
-
-
-private: 
-  
-
-  /**
-   * Simple default constructor (PRIVATE)
-   * 
-   * @update	gess4/18/98
-   * @param 
-   * @return
-   */
-  nsDeque();
-
-  /**
-   * Copy constructor (PRIVATE)
-   * 
-   * @update	gess4/18/98
-   * @param 
-   * @return
-   */
-  nsDeque(const nsDeque& other);
-
-  /**
-   * Deque assignment operator (PRIVATE)
-   *
-   * @update	gess4/18/98
-   * @param   another deque
-   * @return  *this
-   */
-  nsDeque& operator=(const nsDeque& anOther);
-
-  nsDeque&  GrowCapacity(void);
-
-};
-
-/******************************************************
- * Here comes the nsDequeIterator class...
- ******************************************************/
-
-class NS_COM nsDequeIterator {
-public:
-  
-  /**
-   * DequeIterator is an object that knows how to iterate (forward and backward)
-   * a Deque. Normally, you don't need to do this, but there are some special
-   * cases where it is pretty handy, so here you go.
-   *
-   * @update	gess4/18/98
-   * @param   aQueue is the deque object to be iterated
-   * @param   anIndex is the starting position for your iteration
-   */
-  nsDequeIterator(const nsDeque& aQueue,int anIndex=0);
-  
-  /**
-   * DequeIterator is an object that knows how to iterate (forward and backward)
-   * a Deque. Normally, you don't need to do this, but there are some special
-   * cases where it is pretty handy, so here you go.
-   *
-   * @update	gess4/18/98
-   * @param   aQueue is the deque object to be iterated
-   * @param   anIndex is the starting position for your iteration
-   */
-  nsDequeIterator(const nsDequeIterator& aCopy);
-
-  /**
-   * Moves iterator to first element in deque
-   * @update	gess4/18/98
-   * @return  this
-   */
-  nsDequeIterator& First(void);
-
-  /**
-   * Standard assignment operator for deque
-   * @update	gess4/18/98
-   * @param 
-   * @return
-   */
-  nsDequeIterator& operator=(const nsDequeIterator& aCopy);
-
-  /**
-   * preform ! operation against to iterators to test for equivalence
-   * (or lack thereof)!
-   *
-   * @update	gess4/18/98
-   * @param   anIter is the object to be compared to
-   * @return  TRUE if NOT equal.
-   */
-  PRBool operator!=(nsDequeIterator& anIter);
-
-  /**
-   * Compare 2 iterators for equivalence.
-   *
-   * @update	gess4/18/98
-   * @param   anIter is the other iterator to be compared to
-   * @return  TRUE if EQUAL
-   */
-  PRBool operator<(nsDequeIterator& anIter);
-
-  /**
-   * Compare 2 iterators for equivalence.
-   *
-   * @update	gess4/18/98
-   * @param   anIter is the other iterator to be compared to
-   * @return  TRUE if EQUAL
-   */
-  PRBool operator==(nsDequeIterator& anIter);
-  
-  /**
-   * Compare 2 iterators for equivalence.
-   *
-   * @update	gess4/18/98
-   * @param   anIter is the other iterator to be compared to
-   * @return  TRUE if EQUAL
-   */
-  PRBool operator>=(nsDequeIterator& anIter);
-
-  /**
-   * Pre-increment operator 
-   *
-   * @update	gess4/18/98
-   * @return  object at preincremented index
-   */
-  void* operator++();
-
-  /**
-   * Post-increment operator 
-   *
-   * @update	gess4/18/98
-   * @param   param is ignored
-   * @return  object at post-incremented index
-   */
-  void* operator++(int);
-
-  /**
-   * Pre-decrement operator
-   *
-   * @update	gess4/18/98
-   * @return  object at pre-decremented index
-   */
-  void* operator--();
-
-  /**
-   * Post-decrement operator
-   *
-   * @update	gess4/18/98
-   * @param   param is ignored
-   * @return  object at post-decremented index
-   */
-  void* operator--(int);
-  
-  /**
-   * Retrieve the ptr to the iterators notion of current node
-   *
-   * @update	gess4/18/98
-   * @return  object at ith index
-   */
-  void* GetCurrent(void);
-
-  /**
-   * Call this method when you wanto to iterate all the
-   * members of the container, passing a functor along
-   * to call your code.
-   *
-   * @update	gess4/20/98
-   * @param   aFunctor object to call for each member
-   * @return  *this
-   */
-  void ForEach(nsDequeFunctor& aFunctor) const;
-  
-  /**
-   * Call this method when you wanto to iterate all the
-   * members of the container, passing a functor along
-   * to call your code.
-   *
-   * @update	gess4/20/98
-   * @param   aFunctor object to call for each member
-   * @return  *this
-   */
-  const void* FirstThat(nsDequeFunctor& aFunctor) const;
-
-  protected:
-
-        PRInt32         mIndex;
-        const nsDeque&  mDeque;
-};
-
-
-#endif

mozilla/xpcom/ds/nsEmptyEnumerator.cpp

@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-/*
-
-  An empty enumerator.
-
- */
-
-#include "nsIEnumerator.h"
-
-////////////////////////////////////////////////////////////////////////
-
-class EmptyEnumeratorImpl : public nsISimpleEnumerator
-{
-public:
-    EmptyEnumeratorImpl(void) {};
-    virtual ~EmptyEnumeratorImpl(void) {};
-
-    // nsISupports interface
-    NS_IMETHOD_(nsrefcnt) AddRef(void) {
-        return 2;
-    }
-
-    NS_IMETHOD_(nsrefcnt) Release(void) {
-        return 1;
-    }
-
-    NS_IMETHOD QueryInterface(REFNSIID iid, void** result) {
-        if (! result)
-            return NS_ERROR_NULL_POINTER;
-
-        if (iid.Equals(nsISimpleEnumerator::GetIID()) ||
-            iid.Equals(NS_GET_IID(nsISupports))) {
-            *result = (nsISimpleEnumerator*) this;
-            NS_ADDREF(this);
-            return NS_OK;
-        }
-        return NS_NOINTERFACE;
-    }
-
-    // nsISimpleEnumerator
-    NS_IMETHOD HasMoreElements(PRBool* aResult) {
-        *aResult = PR_FALSE;
-        return NS_OK;
-    }
-
-    NS_IMETHOD GetNext(nsISupports** aResult) {
-        return NS_ERROR_UNEXPECTED;
-    }
-};
-
-extern "C" NS_COM nsresult
-NS_NewEmptyEnumerator(nsISimpleEnumerator** aResult)
-{
-    static EmptyEnumeratorImpl gEmptyEnumerator;
-    *aResult = &gEmptyEnumerator;
-    return NS_OK;
-}
-

mozilla/xpcom/ds/nsEnumeratorUtils.cpp

@@ -1,228 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsEnumeratorUtils.h"
-
-
-nsArrayEnumerator::nsArrayEnumerator(nsISupportsArray* aValueArray)
-    : mValueArray(aValueArray),
-      mIndex(0)
-{
-    NS_INIT_REFCNT();
-    NS_IF_ADDREF(mValueArray);
-}
-
-nsArrayEnumerator::~nsArrayEnumerator(void)
-{
-    NS_IF_RELEASE(mValueArray);
-}
-
-NS_IMPL_ISUPPORTS1(nsArrayEnumerator, nsISimpleEnumerator)
-
-NS_IMETHODIMP
-nsArrayEnumerator::HasMoreElements(PRBool* aResult)
-{
-    NS_PRECONDITION(aResult != 0, "null ptr");
-    if (! aResult)
-        return NS_ERROR_NULL_POINTER;
-
-    PRUint32 cnt;
-    nsresult rv = mValueArray->Count(&cnt);
-    if (NS_FAILED(rv)) return rv;
-    *aResult = (mIndex < (PRInt32) cnt);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsArrayEnumerator::GetNext(nsISupports** aResult)
-{
-    NS_PRECONDITION(aResult != 0, "null ptr");
-    if (! aResult)
-        return NS_ERROR_NULL_POINTER;
-
-    PRUint32 cnt;
-    nsresult rv = mValueArray->Count(&cnt);
-    if (NS_FAILED(rv)) return rv;
-    if (mIndex >= (PRInt32) cnt)
-        return NS_ERROR_UNEXPECTED;
-
-    *aResult = mValueArray->ElementAt(mIndex++);
-    return NS_OK;
-}
-
-extern "C" NS_COM nsresult
-NS_NewArrayEnumerator(nsISimpleEnumerator* *result,
-                      nsISupportsArray* array)
-{
-    nsArrayEnumerator* enumer = new nsArrayEnumerator(array);
-    if (enumer == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(enumer);
-    *result = enumer; 
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsSingletonEnumerator::nsSingletonEnumerator(nsISupports* aValue)
-    : mValue(aValue)
-{
-    NS_INIT_REFCNT();
-    NS_IF_ADDREF(mValue);
-    mConsumed = (mValue ? PR_FALSE : PR_TRUE);
-}
-
-nsSingletonEnumerator::~nsSingletonEnumerator()
-{
-    NS_IF_RELEASE(mValue);
-}
-
-NS_IMPL_ISUPPORTS1(nsSingletonEnumerator, nsISimpleEnumerator)
-
-NS_IMETHODIMP
-nsSingletonEnumerator::HasMoreElements(PRBool* aResult)
-{
-    NS_PRECONDITION(aResult != 0, "null ptr");
-    if (! aResult)
-        return NS_ERROR_NULL_POINTER;
-
-    *aResult = !mConsumed;
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsSingletonEnumerator::GetNext(nsISupports** aResult)
-{
-    NS_PRECONDITION(aResult != 0, "null ptr");
-    if (! aResult)
-        return NS_ERROR_NULL_POINTER;
-
-    if (mConsumed)
-        return NS_ERROR_UNEXPECTED;
-
-    mConsumed = PR_TRUE;
-
-    NS_ADDREF(mValue);
-    *aResult = mValue;
-    return NS_OK;
-}
-
-extern "C" NS_COM nsresult
-NS_NewSingletonEnumerator(nsISimpleEnumerator* *result,
-                          nsISupports* singleton)
-{
-    nsSingletonEnumerator* enumer = new nsSingletonEnumerator(singleton);
-    if (enumer == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(enumer);
-    *result = enumer; 
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-
-nsAdapterEnumerator::nsAdapterEnumerator(nsIEnumerator* aEnum)
-    : mEnum(aEnum), mCurrent(0), mStarted(PR_FALSE)
-{
-    NS_INIT_REFCNT();
-    NS_ADDREF(mEnum);
-}
-
-
-nsAdapterEnumerator::~nsAdapterEnumerator()
-{
-    NS_RELEASE(mEnum);
-    NS_IF_RELEASE(mCurrent);
-}
-
-
-NS_IMPL_ISUPPORTS1(nsAdapterEnumerator, nsISimpleEnumerator)
-
-NS_IMETHODIMP
-nsAdapterEnumerator::HasMoreElements(PRBool* aResult)
-{
-    nsresult rv;
-
-    if (mCurrent) {
-        *aResult = PR_TRUE;
-        return NS_OK;
-    }
-
-    if (! mStarted) {
-        mStarted = PR_TRUE;
-        rv = mEnum->First();
-        if (rv == NS_OK) {
-            mEnum->CurrentItem(&mCurrent);
-            *aResult = PR_TRUE;
-        }
-        else {
-            *aResult = PR_FALSE;
-        }
-    }
-    else {
-        *aResult = PR_FALSE;
-
-        rv = mEnum->IsDone();
-        if (rv != NS_OK) {
-            // We're not done. Advance to the next one.
-            rv = mEnum->Next();
-            if (rv == NS_OK) {
-                mEnum->CurrentItem(&mCurrent);
-                *aResult = PR_TRUE;
-            }
-        }
-    }
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsAdapterEnumerator::GetNext(nsISupports** aResult)
-{
-    nsresult rv;
-
-    PRBool hasMore;
-    rv = HasMoreElements(&hasMore);
-    if (NS_FAILED(rv)) return rv;
-
-    if (! hasMore)
-        return NS_ERROR_UNEXPECTED;
-
-    // No need to addref, we "transfer" the ownership to the caller.
-    *aResult = mCurrent;
-    mCurrent = 0;
-    return NS_OK;
-}
-
-extern "C" NS_COM nsresult
-NS_NewAdapterEnumerator(nsISimpleEnumerator* *result,
-                        nsIEnumerator* enumerator)
-{
-    nsAdapterEnumerator* enumer = new nsAdapterEnumerator(enumerator);
-    if (enumer == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(enumer);
-    *result = enumer; 
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-

mozilla/xpcom/ds/nsEnumeratorUtils.h

@@ -1,97 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsEnumeratorUtils_h__
-#define nsEnumeratorUtils_h__
-
-#include "nsIEnumerator.h"
-#include "nsISupportsArray.h"
-
-class NS_COM nsArrayEnumerator : public nsISimpleEnumerator
-{
-public:
-    // nsISupports interface
-    NS_DECL_ISUPPORTS
-
-    // nsISimpleEnumerator interface
-    NS_IMETHOD HasMoreElements(PRBool* aResult);
-    NS_IMETHOD GetNext(nsISupports** aResult);
-
-    // nsRDFArrayEnumerator methods
-    nsArrayEnumerator(nsISupportsArray* aValueArray);
-    virtual ~nsArrayEnumerator(void);
-
-protected:
-    nsISupportsArray* mValueArray;
-    PRInt32 mIndex;
-};
-
-extern "C" NS_COM nsresult
-NS_NewArrayEnumerator(nsISimpleEnumerator* *result,
-                      nsISupportsArray* array);
-
-////////////////////////////////////////////////////////////////////////////////
-
-class NS_COM nsSingletonEnumerator : public nsISimpleEnumerator
-{
-public:
-    NS_DECL_ISUPPORTS
-
-    // nsISimpleEnumerator methods
-    NS_IMETHOD HasMoreElements(PRBool* aResult);
-    NS_IMETHOD GetNext(nsISupports** aResult);
-
-    nsSingletonEnumerator(nsISupports* aValue);
-    virtual ~nsSingletonEnumerator();
-
-protected:
-    nsISupports* mValue;
-    PRBool mConsumed;
-};
-
-extern "C" NS_COM nsresult
-NS_NewSingletonEnumerator(nsISimpleEnumerator* *result,
-                          nsISupports* singleton);
-
-////////////////////////////////////////////////////////////////////////////////
-
-class NS_COM nsAdapterEnumerator : public nsISimpleEnumerator
-{
-public:
-    NS_DECL_ISUPPORTS
-
-    // nsISimpleEnumerator methods
-    NS_IMETHOD HasMoreElements(PRBool* aResult);
-    NS_IMETHOD GetNext(nsISupports** aResult);
-
-    nsAdapterEnumerator(nsIEnumerator* aEnum);
-    virtual ~nsAdapterEnumerator();
-
-protected:
-    nsIEnumerator* mEnum;
-    nsISupports*   mCurrent;
-    PRBool mStarted;
-};
-
-extern "C" NS_COM nsresult
-NS_NewAdapterEnumerator(nsISimpleEnumerator* *result,
-                        nsIEnumerator* enumerator);
-
-////////////////////////////////////////////////////////////////////////
-
-#endif /* nsEnumeratorUtils_h__ */

mozilla/xpcom/ds/nsIArena.h

@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-#ifndef nsIArena_h___
-#define nsIArena_h___
-
-#include "nscore.h"
-#include "nsISupports.h"
-
-#define NS_MIN_ARENA_BLOCK_SIZE 64
-#define NS_DEFAULT_ARENA_BLOCK_SIZE 4096
-
-/// Interface IID for nsIArena
-#define NS_IARENA_IID         \
-{ 0xa24fdad0, 0x93b4, 0x11d1, \
-  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
-#define NS_ARENA_PROGID "component://netscape/arena"
-#define NS_ARENA_CLASSNAME "Arena"
-
-/** Interface to a memory arena abstraction. Arena's use large blocks
- * of memory to allocate smaller objects. Arena's provide no free
- * operator; instead, all of the objects in the arena are deallocated
- * by deallocating the arena (e.g. when it's reference count goes to
- * zero)
- */
-class nsIArena : public nsISupports {
-public:
-  static const nsIID& GetIID() { static nsIID iid = NS_IARENA_IID; return iid; }
-
-  NS_IMETHOD Init(PRUint32 arenaBlockSize) = 0;
-
-  NS_IMETHOD_(void*) Alloc(PRUint32 size) = 0;
-};
-
-/**
- * Create a new arena using the desired block size for allocating the
- * underlying memory blocks. The underlying memory blocks are allocated
- * using the PR heap.
- */
-extern NS_COM nsresult NS_NewHeapArena(nsIArena** aInstancePtrResult,
-                                        PRUint32 aArenaBlockSize = 0);
-
-#define NS_ARENA_CID                                 \
-{ /* 9832ec80-0d6b-11d3-9331-00104ba0fd40 */         \
-    0x9832ec80,                                      \
-    0x0d6b,                                          \
-    0x11d3,                                          \
-    {0x93, 0x31, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
-}
-
-#endif /* nsIArena_h___ */
-
-

mozilla/xpcom/ds/nsIAtom.idl

@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributors:
- *     
- */
-#include "nsISupports.idl"
-
-interface nsISizeOfHandler;
-
-
-[ref] native nsStringRef(nsString);
-%{ C++
-class nsString;
-%}
-
-
-[uuid(3d1b15b0-93b4-11d1-895b-006008911b81)]
-interface nsIAtom : nsISupports
-{
-  /**
-   * Translate the unicode string into the stringbuf.
-   */
-  void ToString(in nsStringRef aString); 
-	
-  /**
-   * Return a pointer to a zero terminated unicode string.
-   */
-   void GetUnicode([shared, retval] out wstring aResult);
-
-  /**
-   * Get the size, in bytes, of the atom.
-   */
-  PRUint32 SizeOf(in nsISizeOfHandler aHandler);
-};
-
-
-%{C++
-
-/**
- * Find an atom that matches the given iso-latin1 C string. The
- * C string is translated into it's unicode equivalent.
- */
-extern NS_COM nsIAtom* NS_NewAtom(const char* isolatin1);
-
-/**
- * Find an atom that matches the given unicode string. The string is assumed
- * to be zero terminated.
- */
-extern NS_COM nsIAtom* NS_NewAtom(const PRUnichar* unicode);
-
-/**
- * Find an atom that matches the given string.
- */
-extern NS_COM nsIAtom* NS_NewAtom(const nsString& aString);
-
-/**
- * Return a count of the total number of atoms currently
- * alive in the system.
- */
-extern NS_COM nsrefcnt NS_GetNumberOfAtoms(void);
-
-extern NS_COM void NS_PurgeAtomTable(void);
-
-%}

mozilla/xpcom/ds/nsIBuffer.h

@@ -1,312 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsIBuffer_h___
-#define nsIBuffer_h___
-
-/**
- * nsIBuffer is something that we use to implement pipes (buffered
- * input/output stream pairs). It might be useful to you for other
- * purposes, but if not, oh well.
- *
- * One of the important things to understand about pipes is how
- * they work with respect to EOF and result values. The following
- * table describes:
- *
- *               | empty & not EOF    | full               | reader closed | writer closed                     |
- * -------------------------------------------------------------------------------------------------------------
- * buffer Read   | readCount == 0     | readCount == N     | N/A           | readCount == N, return NS_OK -or- |
- * operations    | return WOULD_BLOCK | return NS_OK       |               | readCount == 0, return EOF        |
- * -------------------------------------------------------------------------------------------------------------
- * buffer Write  | writeCount == N    | writeCount == 0    | N/A           | assertion!                        | 
- * operations    | return NS_OK       | return WOULD_BLOCK |               |                                   |
- * -------------------------------------------------------------------------------------------------------------
- * input stream  | readCount == 0     | readCount == N     | assertion!    | readCount == N, return NS_OK -or- |
- * Read ops      | return WOULD_BLOCK | return NS_OK       |               | readCount == 0, return EOF        |
- * -------------------------------------------------------------------------------------------------------------
- * output stream | writeCount == N    | writeCount == 0    | return        | assertion!                        | 
- * Write ops     | return NS_OK       | return WOULD_BLOCK | STREAM_CLOSED |                                   |
- * -------------------------------------------------------------------------------------------------------------
- */
-
-#include "nsISupports.h"
-#include "nscore.h"
-
-class nsIInputStream;
-class nsIAllocator;
-class nsIBufferInputStream;
-class nsIBufferOutputStream;
-class nsIBufferObserver;
-
-#define NS_IBUFFER_IID                               \
-{ /* 1eebb300-fb8b-11d2-9324-00104ba0fd40 */         \
-    0x1eebb300,                                      \
-    0xfb8b,                                          \
-    0x11d2,                                          \
-    {0x93, 0x24, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
-}
-
-#define NS_BUFFER_CID                                \
-{ /* 5dbe4de0-fbab-11d2-9324-00104ba0fd40 */         \
-    0x5dbe4de0,                                      \
-    0xfbab,                                          \
-    0x11d2,                                          \
-    {0x93, 0x24, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
-}
-
-#define NS_BUFFER_PROGID "component://netscape/buffer"
-#define NS_BUFFER_CLASSNAME "Buffer"
-
-/**
- * The signature for the reader function passed to WriteSegment. This 
- * specifies where the data should come from that gets written into the buffer.
- * Implementers should return the following:
- * @return NS_OK and readCount - if successfully read something
- * @return NS_BASE_STREAM_EOF - if no more to read
- * @return NS_BASE_STREAM_WOULD_BLOCK - if there is currently no data (in
- *   a non-blocking mode)
- * @return <other-error> - on failure
- */
-typedef NS_CALLBACK(nsReadSegmentFun)(void* closure,
-                                      char* toRawSegment,
-                                      PRUint32 fromOffset,
-                                      PRUint32 count,
-                                      PRUint32 *readCount);
-
-/**
- * The signature of the writer function passed to ReadSegments. This
- * specifies where the data should go that gets read from the buffer.
- * Implementers should return the following:
- * @return NS_OK and writeCount - if successfully wrote something
- * @return NS_BASE_STREAM_CLOSED - if no more can be written
- * @return NS_BASE_STREAM_WOULD_BLOCK - if there is currently space to write (in
- *   a non-blocking mode)
- * @return <other-error> - on failure
- */
-typedef NS_CALLBACK(nsWriteSegmentFun)(void* closure,
-                                       const char* fromRawSegment,
-                                       PRUint32 toOffset,
-                                       PRUint32 count,
-                                       PRUint32 *writeCount);
-
-class nsIBuffer : public nsISupports {
-public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IBUFFER_IID);
-
-    /**
-     * The segment overhead is the amount of space chopped out of each
-     * segment for implementation purposes. The remainder of the segment
-     * is available for data, e.g.:
-     *     segmentDataSize = growBySize - SEGMENT_OVERHEAD;
-     */
-    enum { SEGMENT_OVERHEAD = 8 };
-
-    /**
-     * Initializes a buffer. The segment size (including overhead) will
-     * start from and increment by the growBySize, until reaching maxSize.
-     * The size of the data that can fit in a segment will be the growBySize
-     * minus SEGMENT_OVERHEAD bytes.
-     */
-    NS_IMETHOD Init(PRUint32 growBySize, PRUint32 maxSize,
-                    nsIBufferObserver* observer, nsIAllocator* allocator) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Methods for Readers
-
-    /**
-     * Reads from the read cursor into a char buffer up to a specified length.
-     */
-    NS_IMETHOD Read(char* toBuf, PRUint32 bufLen, PRUint32 *readCount) = 0;
-
-    /**
-     * This read method allows you to pass a callback function that gets called
-     * repeatedly for each buffer segment until the entire amount is read.
-     * This avoids the need to copy data to/from and intermediate buffer.
-     */
-    NS_IMETHOD ReadSegments(nsWriteSegmentFun writer, void* closure, PRUint32 count,
-                            PRUint32 *readCount) = 0;
-
-    /**
-     * Returns the raw char buffer segment and its length available for reading.
-     * @param segmentLogicalOffset - The offset from the current read cursor for
-     *   the segment to be returned. If this is beyond the available written area,
-     *   NULL is returned for the resultSegment.
-     * @param resultSegment - The resulting read segment.
-     * @param resultSegmentLength - The resulting read segment length.
-     *
-     * @return NS_OK - if a read segment is successfully returned, or if
-     *   the requested offset is at or beyond the write cursor (in which case
-     *   the resultSegment will be nsnull and the resultSegmentLen will be 0)
-     * @return NS_BASE_STREAM_WOULD_BLOCK - if the buffer size becomes 0
-     * @return any error set by SetCondition if the requested offset is at
-     *   or beyond the write cursor (in which case the resultSegment will be
-     *   nsnull and the resultSegmentLen will be 0). Note that NS_OK will be
-     *   returned if SetCondition has not been called. 
-     * @return any error returned by OnEmpty
-     */
-    NS_IMETHOD GetReadSegment(PRUint32 segmentLogicalOffset,
-                              const char* *resultSegment,
-                              PRUint32 *resultSegmentLen) = 0;
-
-    /**
-     * Returns the amount of data currently in the buffer available for reading.
-     */
-    NS_IMETHOD GetReadableAmount(PRUint32 *amount) = 0;
-
-    /**
-     * Searches for a string in the buffer. Since the buffer has a notion
-     * of EOF, it is possible that the string may at some time be in the
-     * buffer, but is is not currently found up to some offset. Consequently,
-     * both the found and not found cases return an offset:
-     *    if found, return offset where it was found
-     *    if not found, return offset of the first byte not searched
-     * In the case the buffer is at EOF and the string is not found, the first
-     * byte not searched will correspond to the length of the buffer.
-     */
-    NS_IMETHOD Search(const char* forString, PRBool ignoreCase,
-                      PRBool *found, PRUint32 *offsetSearchedTo) = 0;
-
-    /**
-     * Sets that the reader has closed their end of the stream.
-     */
-    NS_IMETHOD ReaderClosed(void) = 0;
-
-    /**
-     * Tests whether EOF marker is set. Note that this does not necessarily mean that
-     * all the data in the buffer has yet been consumed.
-     */
-    NS_IMETHOD GetCondition(nsresult *result) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Methods for Writers
-
-    /**
-     * Writes from a char buffer up to a specified length.
-     * @param writeCount - The amount that could be written. If the buffer becomes full,
-     *   this could be less then the specified bufLen.
-     */
-    NS_IMETHOD Write(const char* fromBuf, PRUint32 bufLen, PRUint32 *writeCount) = 0;
-
-    /**
-     * Writes from an input stream up to a specified count of bytes.
-     * @param writeCount - The amount that could be written. If the buffer becomes full,
-     *   this could be less then the specified count.
-     */
-    NS_IMETHOD WriteFrom(nsIInputStream* fromStream, PRUint32 count, PRUint32 *writeCount) = 0;
-
-    /**
-     * This write method allows you to pass a callback function that gets called
-     * repeatedly for each buffer segment until the entire amount is written.
-     * This avoids the need to copy data to/from and intermediate buffer.
-     */
-    NS_IMETHOD WriteSegments(nsReadSegmentFun reader, void* closure, PRUint32 count,
-                             PRUint32 *writeCount) = 0;
-
-    /**
-     * Returns the raw char buffer segment and its length available for writing.
-     * @param resultSegment - The resulting write segment.
-     * @param resultSegmentLength - The resulting write segment length.
-     *
-     * @return NS_OK - if there is a segment available to write to
-     * @return NS_BASE_STREAM_CLOSED - if ReaderClosed has been called
-     * @return NS_BASE_STREAM_WOULD_BLOCK - if the max buffer size is exceeded
-     * @return NS_ERROR_OUT_OF_MEMORY - if a new segment could not be allocated
-     * @return any error returned by OnFull
-     */
-    NS_IMETHOD GetWriteSegment(char* *resultSegment,
-                               PRUint32 *resultSegmentLen) = 0;
-
-    /**
-     * Returns the amount of space currently in the buffer available for writing.
-     */
-    NS_IMETHOD GetWritableAmount(PRUint32 *amount) = 0;
-
-    /**
-     * Returns whether the reader has closed their end of the stream.
-     */
-    NS_IMETHOD GetReaderClosed(PRBool *result) = 0;
-
-    /**
-     * Sets an EOF marker (typcially done by the writer) so that a reader can be informed
-     * when all the data in the buffer is consumed. After the EOF marker has been
-     * set, all subsequent calls to the above write methods will return NS_BASE_STREAM_EOF.
-     */
-    NS_IMETHOD SetCondition(nsresult condition) = 0;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-#define NS_IBUFFEROBSERVER_IID                       \
-{ /* 0c18bef0-22a8-11d3-9349-00104ba0fd40 */         \
-    0x0c18bef0,                                      \
-    0x22a8,                                          \
-    0x11d3,                                          \
-    {0x93, 0x49, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
-}
-
-/**
- * A buffer observer is used to detect when the buffer becomes completely full
- * or completely empty.
- */
-class nsIBufferObserver : public nsISupports {
-public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IBUFFEROBSERVER_IID);
-
-    NS_IMETHOD OnFull(nsIBuffer* buffer) = 0;
-
-    NS_IMETHOD OnWrite(nsIBuffer*, PRUint32 amount) = 0;
-
-    NS_IMETHOD OnEmpty(nsIBuffer* buffer) = 0;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * Creates a new buffer.
- * @param observer - may be null
- */
-extern NS_COM nsresult
-NS_NewBuffer(nsIBuffer* *result,
-             PRUint32 growBySize, PRUint32 maxSize,
-             nsIBufferObserver* observer);
-
-/**
- * Creates a new buffer, allocating segments from virtual memory pages.
- */
-extern NS_COM nsresult
-NS_NewPageBuffer(nsIBuffer* *result,
-                 PRUint32 growBySize, PRUint32 maxSize,
-                 nsIBufferObserver* observer);
-
-extern NS_COM nsresult
-NS_NewBufferInputStream(nsIBufferInputStream* *result,
-                        nsIBuffer* buffer, PRBool blocking = PR_FALSE);
-
-extern NS_COM nsresult
-NS_NewBufferOutputStream(nsIBufferOutputStream* *result,
-                         nsIBuffer* buffer, PRBool blocking = PR_FALSE);
-
-extern NS_COM nsresult
-NS_NewPipe(nsIBufferInputStream* *inStrResult,
-           nsIBufferOutputStream* *outStrResult,
-           PRUint32 growBySize, PRUint32 maxSize,
-           PRBool blocking, nsIBufferObserver* observer);
-
-////////////////////////////////////////////////////////////////////////////////
-
-#endif // nsIBuffer_h___

mozilla/xpcom/ds/nsIByteBuffer.h

@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsIByteBuffer_h___
-#define nsIByteBuffer_h___
-
-#include "nscore.h"
-#include "nsISupports.h"
-
-class nsIInputStream;
-
-#define NS_IBYTE_BUFFER_IID    \
-{ 0xe4a6e4b0, 0x93b4, 0x11d1, \
-  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
-#define NS_IBYTEBUFFER_IID    \
-{ 0xe4a6e4b0, 0x93b4, 0x11d1, \
-  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
-#define NS_BYTEBUFFER_PROGID "component://netscape/byte-buffer"
-#define NS_BYTEBUFFER_CLASSNAME "Byte Buffer"
-
-/** Interface to a buffer that holds bytes */
-class nsIByteBuffer : public nsISupports {
-public:
-	static const nsIID& GetIID() { static nsIID iid = NS_IBYTEBUFFER_IID; return iid; }
-
-  NS_IMETHOD Init(PRUint32 aBufferSize) = 0;
-
-  /** @return length of buffer, i.e. how many bytes are currently in it. */
-  NS_IMETHOD_(PRUint32) GetLength(void) const = 0;
-
-  /** @return number of bytes allocated in the buffer */
-  NS_IMETHOD_(PRUint32) GetBufferSize(void) const = 0;
-
-  /** @return the buffer */
-  NS_IMETHOD_(char*) GetBuffer(void) const = 0;
-
-  /** Grow buffer to aNewSize bytes. */
-  NS_IMETHOD_(PRBool) Grow(PRUint32 aNewSize) = 0;
-
-  /** Fill the buffer with data from aStream.  Don't grow the buffer, only
-   *  read until length of buffer equals buffer size. */
-  NS_IMETHOD_(PRInt32) Fill(nsresult* aErrorCode, nsIInputStream* aStream,
-                            PRUint32 aKeep) = 0;
-};
-
-#define NS_BYTEBUFFER_CID                            \
-{ /* a49d5280-0d6b-11d3-9331-00104ba0fd40 */         \
-    0xa49d5280,                                      \
-    0x0d6b,                                          \
-    0x11d3,                                          \
-    {0x93, 0x31, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
-}
-
-/** Create a new byte buffer using the given buffer size. */
-extern NS_COM nsresult 
-NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
-                 nsISupports* aOuter,
-                 PRUint32 aBufferSize = 0);
-
-#endif /* nsIByteBuffer_h___ */
-

mozilla/xpcom/ds/nsICollection.idl

@@ -1,38 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsISupports.idl"
-#include "nsIEnumerator.idl"
-
-[scriptable, uuid(83b6019c-cbc4-11d2-8cca-0060b0fc14a3)]
-interface nsICollection : nsISupports
-{
-
-  PRUint32 Count();
-  nsISupports GetElementAt(in PRUint32 index);
-  void QueryElementAt(in PRUint32 index, in nsIIDRef uuid, 
-                      [iid_is(uuid),retval] out nsQIResult result);
-  void SetElementAt(in PRUint32 index, in nsISupports item);
-  void AppendElement(in nsISupports item);
-  void RemoveElement(in nsISupports item);
-
-  nsIEnumerator Enumerate();
-
-  void Clear();
-
-};

mozilla/xpcom/ds/nsIEnumerator.idl

@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(D1899240-F9D2-11D2-BDD6-000064657374)]
-interface nsISimpleEnumerator : nsISupports {
-  boolean HasMoreElements();
-  nsISupports GetNext();
-};
-
-/*
- * DO NOT USE THIS INTERFACE.  IT IS HORRIBLY BROKEN, USES NS_COMFALSE
- * AND IS BASICALLY IMPOSSIBLE TO USE CORRECTLY THROUGH PROXIES OR
- * XPCONNECT.  IF YOU SEE NEW USES OF THIS INTERFACE IN CODE YOU ARE
- * REVIEWING, YOU SHOULD INSIST ON nsISimpleEnumerator.
- *
- * DON'T MAKE ME COME OVER THERE.
- */
-[scriptable, uuid(ad385286-cbc4-11d2-8cca-0060b0fc14a3)]
-interface nsIEnumerator : nsISupports {
-
-  /** First will reset the list. will return NS_FAILED if no items
-   */
-  void first();
-
-  /** Next will advance the list. will return failed if already at end
-   */
-  void next();
-
-  /** CurrentItem will return the CurrentItem item it will fail if the 
-   *  list is empty
-   */
-  nsISupports currentItem();
-
-  /** return if the collection is at the end.  that is the beginning following 
-   *  a call to Prev and it is the end of the list following a call to next
-   */
-  void isDone();
-};
-
-[uuid(75f158a0-cadd-11d2-8cca-0060b0fc14a3)]
-interface nsIBidirectionalEnumerator : nsIEnumerator {
-
-  /** Last will reset the list to the end. will return NS_FAILED if no items
-   */
-  void Last();
-
-  /** Prev will decrement the list. will return failed if already at beginning
-   */
-  void Prev();
-};
-
-%{C++
-extern "C" NS_COM nsresult
-NS_NewEmptyEnumerator(nsISimpleEnumerator** aResult);
-
-// Construct and return an implementation of a "conjoining enumerator." This
-// enumerator lets you string together two other enumerators into one sequence.
-// The result is an nsIBidirectionalEnumerator, but if either input is not
-// also bidirectional, the Last and Prev operations will fail.
-extern "C" NS_COM nsresult
-NS_NewConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second,
-                           nsIBidirectionalEnumerator* *aInstancePtrResult);
-
-// Construct and return an implementation of a "union enumerator." This
-// enumerator will only return elements that are found in both constituent
-// enumerators.
-extern "C" NS_COM nsresult
-NS_NewUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
-                      nsIEnumerator* *aInstancePtrResult);
-
-// Construct and return an implementation of an "intersection enumerator." This
-// enumerator will return elements that are found in either constituent
-// enumerators, eliminating duplicates.
-extern "C" NS_COM nsresult
-NS_NewIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
-                             nsIEnumerator* *aInstancePtrResult);
-
-%}

mozilla/xpcom/ds/nsIObserver.idl

@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(DB242E01-E4D9-11d2-9DDE-000064657374)]
-interface nsIObserver : nsISupports {
-
-	/*------------------------------- Observe ----------------------------------
-    | Called when aTopic changes for aSubject (presumably; it is actually      |
-    | called whenever anyone calls nsIObserverService::Notify for aTopic).     |
-    |                                                                          |
-    | Implement this in your class to handle the event appropriately.  If      |
-    | your observer objects can respond to multiple topics and/or subjects,    |
-    | then you will have to filter accordingly.                                |
-	--------------------------------------------------------------------------*/
-    void Observe( in nsISupports aSubject,
-				  in wstring     aTopic,
-				  in wstring     someData );
-
-};
-
-%{C++
-
-#define NS_OBSERVER_PROGID "component://netscape/xpcom/observer"
-
-#define NS_OBSERVER_CLASSNAME "Observer"
-
-%}

mozilla/xpcom/ds/nsIObserverList.h

@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsIObserverList_h__
-#define nsIObserverList_h__
-
-#include "nsISupports.h"
-#include "nsIObserver.h"
-#include "nsIEnumerator.h"
-#include "nscore.h"
-
-
-// {E777D482-E6E3-11d2-8ACD-00105A1B8860}
-#define NS_IOBSERVERLIST_IID \
-{ 0xe777d482, 0xe6e3, 0x11d2, { 0x8a, 0xcd, 0x0, 0x10, 0x5a, 0x1b, 0x88, 0x60 } }
-
-// {E777D484-E6E3-11d2-8ACD-00105A1B8860}
-#define NS_OBSERVERLIST_CID \
-{ 0xe777d484, 0xe6e3, 0x11d2, { 0x8a, 0xcd, 0x0, 0x10, 0x5a, 0x1b, 0x88, 0x60 } }
-
-class nsIObserverList : public nsISupports {
-public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IOBSERVERLIST_IID; return iid; }
-    
-    NS_IMETHOD AddObserver(nsIObserver** anObserver) = 0;
-    NS_IMETHOD RemoveObserver(nsIObserver** anObserver) = 0;
-	NS_IMETHOD EnumerateObserverList(nsIEnumerator** anEnumerator) = 0;
-   
-};
-
-extern NS_COM nsresult NS_NewObserverList(nsIObserverList** anObserverList);
-
-#endif /* nsIObserverList_h__ */

mozilla/xpcom/ds/nsIObserverService.idl

@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsISupports.idl"
-#include "nsIObserver.idl"
-#include "nsIEnumerator.idl"
-
-[scriptable, uuid(D07F5192-E3D1-11d2-8ACD-00105A1B8860)]
-interface nsIObserverService : nsISupports {
-
- 	void AddObserver( in nsIObserver anObserver, in wstring aTopic );
-    void RemoveObserver( in nsIObserver anObserver, in wstring nsString );
-	nsIEnumerator EnumerateObserverList( in wstring aTopic );
-    void Notify( in nsISupports aSubject,
-                 in wstring     aTopic,
-                 in wstring     someData );
-
-};
-
-%{C++
-
-#define NS_OBSERVERSERVICE_PROGID "component://netscape/observer-service"
-
-#define NS_OBSERVERSERVICE_CLASSNAME "Observer Service"
-
-%}

mozilla/xpcom/ds/nsIPageManager.h

@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsIPageManager_h__
-#define nsIPageManager_h__
-
-#include "nsISupports.h"
-
-#define NS_PAGEMGR_PAGE_BITS            12      // 4k pages
-#define NS_PAGEMGR_PAGE_SIZE            (1 << NS_PAGEMGR_PAGE_BITS)
-#define NS_PAGEMGR_PAGE_MASK            (NS_PAGEMGR_PAGE_SIZE - 1)
-#define NS_PAGEMGR_PAGE_COUNT(bytes)    (((bytes) + NS_PAGEMGR_PAGE_MASK) >> NS_PAGEMGR_PAGE_BITS)
-
-#define NS_IPAGEMANAGER_IID                          \
-{ /* bea98210-fb7b-11d2-9324-00104ba0fd40 */         \
-    0xbea98210,                                      \
-    0xfb7b,                                          \
-    0x11d2,                                          \
-    {0x93, 0x24, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
-}
-
-#define NS_PAGEMANAGER_CID                           \
-{ /* cac907e0-fb7b-11d2-9324-00104ba0fd40 */         \
-    0xcac907e0,                                      \
-    0xfb7b,                                          \
-    0x11d2,                                          \
-    {0x93, 0x24, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
-}
-#define NS_PAGEMANAGER_PROGID "component://netscape/page-manager"
-#define NS_PAGEMANAGER_CLASSNAME "Page Manager"
-
-class nsIPageManager : public nsISupports {
-public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPAGEMANAGER_IID);
-
-    NS_IMETHOD AllocPages(PRUint32 pageCount, void* *result) = 0;
-
-    NS_IMETHOD DeallocPages(PRUint32 pageCount, void* pages) = 0;
-
-};
-
-#endif // nsIPageManager_h__

mozilla/xpcom/ds/nsIProperties.h

@@ -1,150 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL. You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All Rights
- * Reserved.
- */
-
-#ifndef nsIProperties_h___
-#define nsIProperties_h___
-
-#include "nsISupports.h"
-#include "nsIEnumerator.h"
-#include "nsISupportsArray.h"
-
-#define NS_IPROPERTIES_IID                           \
-{ /* f42bc870-dc17-11d2-9311-00e09805570f */         \
-    0xf42bc870,                                      \
-    0xdc17,                                          \
-    0x11d2,                                          \
-    {0x93, 0x11, 0x00, 0xe0, 0x98, 0x05, 0x57, 0x0f} \
-}
-
-#define NS_PROPERTIES_CID                            \
-{ /* b3efe4d0-0d6b-11d3-9331-00104ba0fd40 */         \
-    0xb3efe4d0,                                      \
-    0x0d6b,                                          \
-    0x11d3,                                          \
-    {0x93, 0x31, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
-}
-#define NS_PROPERTIES_PROGID "component://netscape/properties"
-#define NS_PROPERTIES_CLASSNAME "Properties"
-
-class nsIProperties : public nsISupports {
-public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IPROPERTIES_IID; return iid; }
-    
-    /**
-     * Defines a new property.
-     * @return NS_ERROR_FAILURE if a property is already defined.
-     */
-    NS_IMETHOD DefineProperty(const char* prop, nsISupports* initialValue) = 0;
-
-    /**
-     * Undefines a property.
-     * @return NS_ERROR_FAILURE if a property is not already defined.
-     */
-    NS_IMETHOD UndefineProperty(const char* prop) = 0;
-
-    /**
-     * Gets a property.
-     * @return NS_ERROR_FAILURE if a property is not already defined.
-     */
-    NS_IMETHOD GetProperty(const char* prop, nsISupports* *result) = 0;
-
-    /**
-     * Sets a property.
-     * @return NS_ERROR_FAILURE if a property is not already defined.
-     */
-    NS_IMETHOD SetProperty(const char* prop, nsISupports* value) = 0;
-
-    /**
-     * @return NS_OK if the property exists with the specified value
-     * @return NS_COMFALSE if the property does not exist, or doesn't have
-     * the specified value (values are compared with ==)
-     */
-    NS_IMETHOD HasProperty(const char* prop, nsISupports* value) = 0; 
-
-};
-
-// Returns a default implementation of an nsIProperties object.
-extern nsresult
-NS_NewIProperties(nsIProperties* *result);
-
-////////////////////////////////////////////////////////////////////////////////
-
-#include "nsID.h"
-#include "nsIInputStream.h"
-#include "nsIOutputStream.h"
-#include "nsString.h"
-
-// {1A180F60-93B2-11d2-9B8B-00805F8A16D9}
-#define NS_IPERSISTENTPROPERTIES_IID \
-{ 0x1a180f60, 0x93b2, 0x11d2, \
-  { 0x9b, 0x8b, 0x0, 0x80, 0x5f, 0x8a, 0x16, 0xd9 } }
-
-// {2245E573-9464-11d2-9B8B-00805F8A16D9}
-NS_DECLARE_ID(kPersistentPropertiesCID,
-  0x2245e573, 0x9464, 0x11d2, 0x9b, 0x8b, 0x0, 0x80, 0x5f, 0x8a, 0x16, 0xd9);
-
-#define NS_PERSISTENTPROPERTIES_PROGID "component://netscape/persistent-properties"
-#define NS_PERSISTENTPROPERTIES_CLASSNAME "Persistent Properties"
-
-class nsIPersistentProperties : public nsIProperties
-{
-public:
-  static const nsIID& GetIID() { static nsIID iid = NS_IPERSISTENTPROPERTIES_IID; return iid; }
-
-  NS_IMETHOD Load(nsIInputStream* aIn) = 0;
-  NS_IMETHOD Save(nsIOutputStream* aOut, const nsString& aHeader) = 0;
-  NS_IMETHOD Subclass(nsIPersistentProperties* aSubclass) = 0;	
-
-  /**
-   * Enumerates the properties in the supplied enumerator.
-   * @return NS_ERROR_FAILURE if no properties to enumerate
-   */
-  NS_IMETHOD EnumerateProperties(nsIBidirectionalEnumerator** aResult) = 0;
-
-  // XXX these 2 methods will be subsumed by the ones from 
-  // nsIProperties once we figure this all out
-  NS_IMETHOD GetStringProperty(const nsString& aKey, nsString& aValue) = 0;
-  NS_IMETHOD SetStringProperty(const nsString& aKey, nsString& aNewValue,
-                         nsString& aOldValue) = 0;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-// {C23C10B3-0E1A-11d3-A430-0060B0EB5963}
-#define NS_IPROPERTYELEMENT_IID \
-{ 0xc23c10b3, 0xe1a, 0x11d3, \
-	{ 0xa4, 0x30, 0x0, 0x60, 0xb0, 0xeb, 0x59, 0x63 } }
-
-// {579C0568-0E1B-11d3-A430-0060B0EB5963}
-NS_DECLARE_ID(kPropertyElementCID, 
-	0x579c0568, 0xe1b, 0x11d3, 0xa4, 0x30, 0x0, 0x60, 0xb0, 0xeb, 0x59, 0x63);
-
-class nsIPropertyElement : public nsISupports
-{
-public:
-	static const nsIID& GetIID() { static nsIID iid = NS_IPROPERTYELEMENT_IID; return iid; }	
-
-	NS_IMETHOD SetKey(nsString* aKey) = 0;
-	NS_IMETHOD SetValue(nsString* aValue) = 0; 
-	NS_IMETHOD GetKey(nsString** aReturnKey) = 0;
-	NS_IMETHOD GetValue(nsString** aReturnValue) = 0;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-#endif // nsIProperties_h___

mozilla/xpcom/ds/nsISimpleEnumerator.h

@@ -1,26 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsISimpleEnumerator_h__
-#define nsISimpleEnumerator_h__
-
-// This file is needed to pacify the xpidl-generated header files.
-#include "nsIEnumerator.h"
-
-#endif // nsISimpleEnumerator_h__
-

mozilla/xpcom/ds/nsISizeOfHandler.h

@@ -1,100 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-#ifndef nsISizeOfHandler_h___
-#define nsISizeOfHandler_h___
-
-#include "nscore.h"
-#include "nsISupports.h"
-
-/* c028d1f0-fc9e-11d1-89e4-006008911b81 */
-#define NS_ISIZEOF_HANDLER_IID \
-{ 0xc028d1f0, 0xfc9e, 0x11d1, {0x89, 0xe4, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81}}
-
-class nsIAtom;
-class nsISizeOfHandler;
-
-/**
- * Function used by the Report method to report data gathered during
- * a collection of data.
- */
-typedef void (*nsISizeofReportFunc)(nsISizeOfHandler* aHandler,
-                                    nsIAtom* aKey,
-                                    PRUint32 aCount,
-                                    PRUint32 aTotalSize,
-                                    PRUint32 aMinSize,
-                                    PRUint32 aMaxSize,
-                                    void* aArg);
-
-/**
- * An API to managing a sizeof computation of an arbitrary graph.
- * The handler is responsible for remembering which objects have been
- * seen before (using RecordObject). Note that the handler doesn't
- * hold references to nsISupport's objects; the assumption is that the
- * objects being sized are stationary and will not be modified during
- * the sizing computation and therefore do not need an extra reference
- * count.
- *
- * Users of this API are responsible for the actual graph/tree walking.
- */
-class nsISizeOfHandler : public nsISupports {
-public:
-	NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISIZEOF_HANDLER_IID)
-
-  /**
-   * Initialize the handler for a new collection of data. This empties
-   * out the object prescence table and the keyed size table.
-   */
-  NS_IMETHOD Init() = 0;
-
-  /**
-   * Record the sizing status of a given object. The first time
-   * aObject is recorded, aResult will be PR_FALSE. Subsequent times,
-   * aResult will be PR_TRUE.
-   */
-  NS_IMETHOD RecordObject(void* aObject, PRBool* aResult) = 0;
-
-  /**
-   * Add size information to the running size data. The atom is used
-   * as a key to keep type specific running totals of size
-   * information.  This increments the total count and the total size
-   * as well as updates the minimum, maximum and total size for aKey's
-   * type.
-   */
-  NS_IMETHOD AddSize(nsIAtom* aKey, PRUint32 aSize) = 0;
-
-  /**
-   * Enumerate data collected for each type and invoke the
-   * reporting function with the data gathered.
-   */
-  NS_IMETHOD Report(nsISizeofReportFunc aFunc, void* aArg) = 0;
-
-  /**
-   * Get the current totals - the number of total objects sized (not
-   * necessarily anything to do with RecordObject's tracking of
-   * objects) and the total number of bytes that those object use. The
-   * counters are not reset by this call (use Init to reset
-   * everything).
-   */
-  NS_IMETHOD GetTotals(PRUint32* aTotalCountResult,
-                       PRUint32* aTotalSizeResult) = 0;
-};
-
-extern NS_COM nsresult
-NS_NewSizeOfHandler(nsISizeOfHandler** aInstancePtrResult);
-
-#endif /* nsISizeofHandler_h___ */

mozilla/xpcom/ds/nsISupportsArray.idl

@@ -1,104 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-
-#include "nsISupports.idl"
-#include "nsICollection.idl"
-
-native nsISupportsArrayEnumFunc(nsISupportsArrayEnumFunc);
-
-%{C++
-
-class nsIBidirectionalEnumerator;
- 
-#define NS_SUPPORTSARRAY_CID                         \
-{ /* bda17d50-0d6b-11d3-9331-00104ba0fd40 */         \
-    0xbda17d50,                                      \
-    0x0d6b,                                          \
-    0x11d3,                                          \
-    {0x93, 0x31, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
-}
-#define NS_SUPPORTSARRAY_PROGID "component://netscape/supports-array"
-#define NS_SUPPORTSARRAY_CLASSNAME "Supports Array"
- 
-// Enumerator callback function. Return PR_FALSE to stop
-typedef PRBool (*nsISupportsArrayEnumFunc)(nsISupports* aElement, void *aData);
- 
-%}
-
-[scriptable, uuid(791eafa0-b9e6-11d1-8031-006008159b5a)]
-interface nsISupportsArray : nsICollection {
-
-  [notxpcom] boolean Equals([const] in nsISupportsArray other);
-  
-  [notxpcom] nsISupports ElementAt(in unsigned long aIndex);
-  
-  [notxpcom] long IndexOf([const] in nsISupports aPossibleElement);
-  [notxpcom] long IndexOfStartingAt([const] in nsISupports aPossibleElement,
-                                    in unsigned long aStartIndex);
-  [notxpcom] long LastIndexOf([const] in nsISupports aPossibleElement);
-  
-  // xpcom-compatible versions
-  long GetIndexOf(in nsISupports aPossibleElement);
-  long GetIndexOfStartingAt(in nsISupports aPossibleElement,
-                            in unsigned long aStartIndex);
-  long GetLastIndexOf(in nsISupports aPossibleElement);  
-  
-  [notxpcom] boolean InsertElementAt(in nsISupports aElement,
-                                     in unsigned long aIndex);
-  [notxpcom] boolean ReplaceElementAt(in nsISupports aElement,
-                                      in unsigned long aIndex);
-
-  [notxpcom] boolean RemoveElementAt(in unsigned long aIndex);
-  [notxpcom] boolean RemoveLastElement([const] in nsISupports aElement);
-  
-  // xpcom-compatible versions
-  void DeleteLastElement(in nsISupports aElement);
-  void DeleteElementAt(in unsigned long aIndex);
-  
-  [notxpcom] boolean AppendElements(in nsISupportsArray aElements);
-  
-  void Compact();
-  
-  [notxpcom, noscript]
-      boolean EnumerateForwards(in nsISupportsArrayEnumFunc aFunc,
-                                in voidStar aData);
-  [notxpcom, noscript]
-      boolean EnumerateBackwards(in nsISupportsArrayEnumFunc aFunc,
-                                 in voidStar aData);
-%{C++
-private:
-//  NS_IMETHOD_(nsISupportsArray&) operator=(const nsISupportsArray& other) = 0;
-  NS_IMETHOD_(PRBool) operator==(const nsISupportsArray& other) = 0;
-  NS_IMETHOD_(nsISupports*)  operator[](PRUint32 aIndex) = 0;
-%}
-};
-
-%{C++
-
-// Construct and return a default implementation of nsISupportsArray:
-extern NS_COM nsresult
-NS_NewISupportsArray(nsISupportsArray** aInstancePtrResult);
-
-// Construct and return a default implementation of an enumerator for nsISupportsArrays:
-extern NS_COM nsresult
-NS_NewISupportsArrayEnumerator(nsISupportsArray* array,
-                               nsIBidirectionalEnumerator* *aInstancePtrResult);
-
-
-%}

mozilla/xpcom/ds/nsISupportsPrimitives.idl

@@ -1,263 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-/* nsISupports wrappers for single primitive pieces of data. */
-
-#include "nsISupports.idl"
-
-/**
- * These first three are pointer types and do data copying
- * using the nsIAllocator. Be careful!
- */ 
-
-[scriptable, uuid(d18290a0-4a1c-11d3-9890-006008962422)]
-interface nsISupportsID : nsISupports
-{
-    attribute nsIDPtr data;
-    string toString();
-};
-
-[scriptable, uuid(d65ff270-4a1c-11d3-9890-006008962422)]
-interface nsISupportsString : nsISupports
-{
-    attribute string data;
-    string toString();
-};
-
-[scriptable, uuid(d79dc970-4a1c-11d3-9890-006008962422)]
-interface nsISupportsWString : nsISupports
-{
-    attribute wstring data;
-    wstring toString();
-};
-
-/**
- * The rest are truly primitive and are passed by value
- */ 
-
-[scriptable, uuid(ddc3b490-4a1c-11d3-9890-006008962422)]
-interface nsISupportsPRBool : nsISupports
-{
-    attribute PRBool data;
-    string toString();
-};
-
-[scriptable, uuid(dec2e4e0-4a1c-11d3-9890-006008962422)]
-interface nsISupportsPRUint8 : nsISupports
-{
-    attribute PRUint8 data;
-    string toString();
-};
-
-[scriptable, uuid(dfacb090-4a1c-11d3-9890-006008962422)]
-interface nsISupportsPRUint16 : nsISupports
-{
-    attribute PRUint16 data;
-    string toString();
-};
-
-[scriptable, uuid(e01dc470-4a1c-11d3-9890-006008962422)]
-interface nsISupportsPRUint32 : nsISupports
-{
-    attribute PRUint32 data;
-    string toString();
-};
-
-[scriptable, uuid(e13567c0-4a1c-11d3-9890-006008962422)]
-interface nsISupportsPRUint64 : nsISupports
-{
-    attribute PRUint64 data;
-    string toString();
-};
-
-[scriptable, uuid(e2563630-4a1c-11d3-9890-006008962422)]
-interface nsISupportsPRTime : nsISupports
-{
-    attribute PRTime data;
-    string toString();
-};
-
-[scriptable, uuid(e2b05e40-4a1c-11d3-9890-006008962422)]
-interface nsISupportsChar : nsISupports
-{
-    attribute char data;
-    string toString();
-};
-
-[scriptable, uuid(e30d94b0-4a1c-11d3-9890-006008962422)]
-interface nsISupportsPRInt16 : nsISupports
-{
-    attribute PRInt16 data;
-    string toString();
-};
-
-[scriptable, uuid(e36c5250-4a1c-11d3-9890-006008962422)]
-interface nsISupportsPRInt32 : nsISupports
-{
-    attribute PRInt32 data;
-    string toString();
-};
-
-[scriptable, uuid(e3cb0ff0-4a1c-11d3-9890-006008962422)]
-interface nsISupportsPRInt64 : nsISupports
-{
-    attribute PRInt64 data;
-    string toString();
-};
-
-[scriptable, uuid(abeaa390-4ac0-11d3-baea-00805f8a5dd7)]
-interface nsISupportsFloat : nsISupports
-{
-    attribute float data;
-    string toString();
-};
-
-[scriptable, uuid(b32523a0-4ac0-11d3-baea-00805f8a5dd7)]
-interface nsISupportsDouble : nsISupports
-{
-    attribute double data;
-    string toString();
-};
-
-[scriptable, uuid(464484f0-568d-11d3-baf8-00805f8a5dd7)]
-interface nsISupportsVoid : nsISupports
-{
-    /*
-    *  This would be: "[noscript] attribute voidStar data;" but for...
-    *  http://bugzilla.mozilla.org/show_bug.cgi?id=11454
-    */
-    [noscript] void GetData([shared,retval] out voidStar aData);
-    [noscript] void SetData(in voidStar aData);
-    string toString();
-};
-
-/////////////////////////////////////////////////////////////////////////
-
-%{C++
-// {ACF8DC40-4A25-11d3-9890-006008962422}
-#define NS_SUPPORTS_ID_CID \
-{ 0xacf8dc40, 0x4a25, 0x11d3, \
-    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
-#define NS_SUPPORTS_ID_PROGID "component://netscape/supports-id"
-#define NS_SUPPORTS_ID_CLASSNAME "Supports ID"
-
-// {ACF8DC41-4A25-11d3-9890-006008962422}
-#define NS_SUPPORTS_STRING_CID \
-{ 0xacf8dc41, 0x4a25, 0x11d3, \
-    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
-#define NS_SUPPORTS_STRING_PROGID "component://netscape/supports-string"
-#define NS_SUPPORTS_STRING_CLASSNAME "Supports String"
-
-// {ACF8DC42-4A25-11d3-9890-006008962422}
-#define NS_SUPPORTS_WSTRING_CID \
-{ 0xacf8dc42, 0x4a25, 0x11d3, \
-    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
-#define NS_SUPPORTS_WSTRING_PROGID "component://netscape/supports-wstring"
-#define NS_SUPPORTS_WSTRING_CLASSNAME "Supports WString"
-
-// {ACF8DC43-4A25-11d3-9890-006008962422}
-#define NS_SUPPORTS_PRBOOL_CID \
-{ 0xacf8dc43, 0x4a25, 0x11d3, \
-    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
-#define NS_SUPPORTS_PRBOOL_PROGID "component://netscape/supports-PRBool"
-#define NS_SUPPORTS_PRBOOL_CLASSNAME "Supports PRBool"
-
-// {ACF8DC44-4A25-11d3-9890-006008962422}
-#define NS_SUPPORTS_PRUINT8_CID \
-{ 0xacf8dc44, 0x4a25, 0x11d3, \
-    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
-#define NS_SUPPORTS_PRUINT8_PROGID "component://netscape/supports-PRUint8"
-#define NS_SUPPORTS_PRUINT8_CLASSNAME "Supports PRUint8"
-
-// {ACF8DC46-4A25-11d3-9890-006008962422}
-#define NS_SUPPORTS_PRUINT16_CID \
-{ 0xacf8dc46, 0x4a25, 0x11d3, \
-    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
-#define NS_SUPPORTS_PRUINT16_PROGID "component://netscape/supports-PRUint16"
-#define NS_SUPPORTS_PRUINT16_CLASSNAME "Supports PRUint16"
-
-// {ACF8DC47-4A25-11d3-9890-006008962422}
-#define NS_SUPPORTS_PRUINT32_CID \
-{ 0xacf8dc47, 0x4a25, 0x11d3, \
-    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
-#define NS_SUPPORTS_PRUINT32_PROGID "component://netscape/supports-PRUint32"
-#define NS_SUPPORTS_PRUINT32_CLASSNAME "Supports PRUint32"
-
-// {ACF8DC48-4A25-11d3-9890-006008962422}
-#define NS_SUPPORTS_PRUINT64_CID \
-{ 0xacf8dc48, 0x4a25, 0x11d3, \
-    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
-#define NS_SUPPORTS_PRUINT64_PROGID "component://netscape/supports-PRUint64"
-#define NS_SUPPORTS_PRUINT64_CLASSNAME "Supports PRUint64"
-
-// {ACF8DC49-4A25-11d3-9890-006008962422}
-#define NS_SUPPORTS_PRTIME_CID \
-{ 0xacf8dc49, 0x4a25, 0x11d3, \
-    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
-#define NS_SUPPORTS_PRTIME_PROGID "component://netscape/supports-PRTime"
-#define NS_SUPPORTS_PRTIME_CLASSNAME "Supports PRTime"
-
-// {ACF8DC4A-4A25-11d3-9890-006008962422}
-#define NS_SUPPORTS_CHAR_CID \
-{ 0xacf8dc4a, 0x4a25, 0x11d3, \
-    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
-#define NS_SUPPORTS_CHAR_PROGID "component://netscape/supports-char"
-#define NS_SUPPORTS_CHAR_CLASSNAME "Supports Char"
-
-// {ACF8DC4B-4A25-11d3-9890-006008962422}
-#define NS_SUPPORTS_PRINT16_CID \
-{ 0xacf8dc4b, 0x4a25, 0x11d3, \
-    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
-#define NS_SUPPORTS_PRINT16_PROGID "component://netscape/supports-PRInt16"
-#define NS_SUPPORTS_PRINT16_CLASSNAME "Supports PRInt16"
-
-// {ACF8DC4C-4A25-11d3-9890-006008962422}
-#define NS_SUPPORTS_PRINT32_CID \
-{ 0xacf8dc4c, 0x4a25, 0x11d3, \
-    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
-#define NS_SUPPORTS_PRINT32_PROGID "component://netscape/supports-PRInt32"
-#define NS_SUPPORTS_PRINT32_CLASSNAME "Supports PRInt32"
-
-// {ACF8DC4D-4A25-11d3-9890-006008962422}
-#define NS_SUPPORTS_PRINT64_CID \
-{ 0xacf8dc4d, 0x4a25, 0x11d3, \
-    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
-#define NS_SUPPORTS_PRINT64_PROGID "component://netscape/supports-PRInt64"
-#define NS_SUPPORTS_PRINT64_CLASSNAME "Supports PRInt64"
-
-// {CBF86870-4AC0-11d3-BAEA-00805F8A5DD7}
-#define NS_SUPPORTS_FLOAT_CID \
-{ 0xcbf86870, 0x4ac0, 0x11d3, \
-    { 0xba, 0xea, 0x0, 0x80, 0x5f, 0x8a, 0x5d, 0xd7 } }
-#define NS_SUPPORTS_FLOAT_PROGID "component://netscape/supports-float"
-#define NS_SUPPORTS_FLOAT_CLASSNAME "Supports float"
-
-// {CBF86871-4AC0-11d3-BAEA-00805F8A5DD7}
-#define NS_SUPPORTS_DOUBLE_CID \
-{ 0xcbf86871, 0x4ac0, 0x11d3, \
-    { 0xba, 0xea, 0x0, 0x80, 0x5f, 0x8a, 0x5d, 0xd7 } }
-#define NS_SUPPORTS_DOUBLE_PROGID "component://netscape/supports-double"
-#define NS_SUPPORTS_DOUBLE_CLASSNAME "Supports double"
-
-// {AF10F3E0-568D-11d3-BAF8-00805F8A5DD7}
-#define NS_SUPPORTS_VOID_CID \
-{ 0xaf10f3e0, 0x568d, 0x11d3, \
-    { 0xba, 0xf8, 0x0, 0x80, 0x5f, 0x8a, 0x5d, 0xd7 } }
-#define NS_SUPPORTS_VOID_PROGID "component://netscape/supports-void"
-#define NS_SUPPORTS_VOID_CLASSNAME "Supports void"
-%}

mozilla/xpcom/ds/nsIUnicharBuffer.h

@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-#ifndef nsIUnicharBuffer_h___
-#define nsIUnicharBuffer_h___
-
-#include "nscore.h"
-#include "nsISupports.h"
-class nsIUnicharInputStream;
-
-#define NS_IUNICHARBUFFER_IID \
-{ 0x14cf6970, 0x93b5, 0x11d1, \
-  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
-
-/// Interface to a buffer that holds unicode characters
-class nsIUnicharBuffer : public nsISupports {
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IUNICHARBUFFER_IID);
-
-  NS_IMETHOD Init(PRUint32 aBufferSize) = 0;
-  NS_IMETHOD_(PRInt32) GetLength() const = 0;
-  NS_IMETHOD_(PRInt32) GetBufferSize() const = 0;
-  NS_IMETHOD_(PRUnichar*) GetBuffer() const = 0;
-  NS_IMETHOD_(PRBool) Grow(PRInt32 aNewSize) = 0;
-  NS_IMETHOD_(PRInt32) Fill(nsresult* aErrorCode, nsIUnicharInputStream* aStream,
-                            PRInt32 aKeep) = 0;
-};
-
-/// Factory method for nsIUnicharBuffer.
-extern NS_COM nsresult
-NS_NewUnicharBuffer(nsIUnicharBuffer** aInstancePtrResult,
-                    nsISupports* aOuter,
-                    PRUint32 aBufferSize = 0);
-
-#define NS_UNICHARBUFFER_CID                         \
-{ /* c81fd8f0-0d6b-11d3-9331-00104ba0fd40 */         \
-    0xc81fd8f0,                                      \
-    0x0d6b,                                          \
-    0x11d3,                                          \
-    {0x93, 0x31, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
-}
-
-#endif /* nsIUnicharBuffer_h___ */

mozilla/xpcom/ds/nsInt64.h

@@ -1,340 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsInt64_h__
-#define nsInt64_h__
-
-#include "prlong.h"
-#include "nscore.h"
-
-/**
- * This class encapsulates full 64-bit integer functionality and
- * provides simple arithmetic and conversion operations.
- */
-
-// If you ever decide that you need to add a non-inline method to this
-// class, be sure to change the class declaration to "class NS_BASE
-// nsInt64".
-
-class nsInt64
-{
-private:
-    PRInt64 mValue;
-
-public:
-    /**
-     * Construct a new 64-bit integer.
-     */
-    nsInt64(void) : mValue(LL_ZERO) {
-    }
-
-    /**
-     * Construct a new 64-bit integer from a 32-bit signed integer
-     */
-    nsInt64(const PRInt32 aInt32) {
-        LL_I2L(mValue, aInt32);
-    }
-
-    /**
-     * Construct a new 64-bit integer from a 32-bit unsigned integer
-     */
-    nsInt64(const PRUint32 aUint32) {
-        LL_UI2L(mValue, aUint32);
-    }
-
-    /**
-     * Construct a new 64-bit integer from a floating point value.
-     */
-    nsInt64(const PRFloat64 aFloat64) {
-        LL_D2L(mValue, aFloat64);
-    }
-
-    /**
-     * Construct a new 64-bit integer from a native 64-bit integer
-     */
-    nsInt64(const PRInt64 aInt64) : mValue(aInt64) {
-    }
-
-    /**
-     * Construct a new 64-bit integer from another 64-bit integer
-     */
-    nsInt64(const nsInt64& aObject) : mValue(aObject.mValue) {
-    }
-
-    // ~nsInt64(void) -- XXX destructor unnecessary
-
-    /**
-     * Assign a 64-bit integer to another 64-bit integer
-     */
-    const nsInt64& operator =(const nsInt64& aObject) {
-        mValue = aObject.mValue;
-        return *this;
-    }
-
-    /**
-     * Convert a 64-bit integer to a signed 32-bit value
-     */
-    operator PRInt32(void) const {
-        PRInt32 result;
-        LL_L2I(result, mValue);
-        return result;
-    }
-
-    /**
-     * Convert a 64-bit integer to an unsigned 32-bit value
-     */
-    operator PRUint32(void) const {
-        PRUint32 result;
-        LL_L2UI(result, mValue);
-        return result;
-    }
-
-    /**
-     * Convert a 64-bit integer to a floating point value
-     */
-    operator PRFloat64(void) const {
-        PRFloat64 result;
-        LL_L2D(result, mValue);
-        return result;
-    }
-
-    /**
-     * Convert a 64-bit integer to a native 64-bit integer.
-     */
-    operator PRInt64(void) const {
-        return mValue;
-    }
-
-    /**
-     * Perform unary negation on a 64-bit integer.
-     */
-    const nsInt64 operator -(void) {
-        nsInt64 result;
-        LL_NEG(result.mValue, mValue);
-        return result;
-    }
-
-    // Arithmetic operators
-    friend const nsInt64 operator +(const nsInt64& aObject1, const nsInt64& aObject2);
-    friend const nsInt64 operator -(const nsInt64& aObject1, const nsInt64& aObject2);
-    friend const nsInt64 operator *(const nsInt64& aObject1, const nsInt64& aObject2);
-    friend const nsInt64 operator /(const nsInt64& aObject1, const nsInt64& aObject2);
-    friend const nsInt64 operator %(const nsInt64& aObject1, const nsInt64& aObject2);
-
-    /**
-     * Increment a 64-bit integer by a 64-bit integer amount.
-     */
-    nsInt64& operator +=(const nsInt64& aObject) {
-        LL_ADD(mValue, mValue, aObject.mValue);
-        return *this;
-    }
-
-    /**
-     * Decrement a 64-bit integer by a 64-bit integer amount.
-     */
-    nsInt64& operator -=(const nsInt64& aObject) {
-        LL_SUB(mValue, mValue, aObject.mValue);
-        return *this;
-    }
-
-    /**
-     * Multiply a 64-bit integer by a 64-bit integer amount.
-     */
-    nsInt64& operator *=(const nsInt64& aObject) {
-        LL_MUL(mValue, mValue, aObject.mValue);
-        return *this;
-    }
-
-    /**
-     * Divide a 64-bit integer by a 64-bit integer amount.
-     */
-    nsInt64& operator /=(const nsInt64& aObject) {
-        LL_DIV(mValue, mValue, aObject.mValue);
-        return *this;
-    }
-
-    /**
-     * Compute the modulus of a 64-bit integer to a 64-bit value.
-     */
-    nsInt64& operator %=(const nsInt64& aObject) {
-        LL_MOD(mValue, mValue, aObject.mValue);
-        return *this;
-    }
-
-    // Comparison operators
-    friend PRBool operator ==(const nsInt64& aObject1, const nsInt64& aObject2);
-    friend PRBool operator !=(const nsInt64& aObject1, const nsInt64& aObject2);
-    friend PRBool operator >(const nsInt64& aObject1, const nsInt64& aObject2);
-    friend PRBool operator >=(const nsInt64& aObject1, const nsInt64& aObject2);
-    friend PRBool operator <(const nsInt64& aObject1, const nsInt64& aObject2);
-    friend PRBool operator <=(const nsInt64& aObject1, const nsInt64& aObject2);
-
-    // Bitwise operators
-    friend const nsInt64 operator &(const nsInt64& aObject1, const nsInt64& aObject2);
-    friend const nsInt64 operator |(const nsInt64& aObject1, const nsInt64& aObject2);
-    friend const nsInt64 operator ^(const nsInt64& aObject1, const nsInt64& aObject2);
-
-    /**
-     * Compute the bitwise NOT of a 64-bit integer
-     */
-    const nsInt64 operator ~(void) {
-        nsInt64 result;
-        LL_NOT(result.mValue, mValue);
-        return result;
-    }
-
-    /**
-     * Compute the bitwise AND with another 64-bit integer
-     */
-    nsInt64& operator &=(const nsInt64& aObject) {
-        LL_AND(mValue, mValue, aObject.mValue);
-        return *this;
-    }
-
-    /**
-     * Compute the bitwise OR with another 64-bit integer
-     */
-    nsInt64& operator |=(const nsInt64& aObject) {
-        LL_OR(mValue, mValue, aObject.mValue);
-        return *this;
-    }
-
-    /**
-     * Compute the bitwise XOR with another 64-bit integer
-     */
-    nsInt64& operator ^=(const nsInt64& aObject) {
-        LL_XOR(mValue, mValue, aObject.mValue);
-        return *this;
-    }
-};
-
-
-/**
- * Add two 64-bit integers.
- */
-inline const nsInt64
-operator +(const nsInt64& aObject1, const nsInt64& aObject2) {
-    return nsInt64(aObject1) += aObject2;
-}
-
-/**
- * Subtract one 64-bit integer from another.
- */
-inline const nsInt64
-operator -(const nsInt64& aObject1, const nsInt64& aObject2) {
-    return nsInt64(aObject1) -= aObject2;
-}
-
-/**
- * Multiply two 64-bit integers
- */
-inline const nsInt64
-operator *(const nsInt64& aObject1, const nsInt64& aObject2) {
-    return nsInt64(aObject1) *= aObject2;
-}
-
-/**
- * Divide one 64-bit integer by another
- */
-inline const nsInt64
-operator /(const nsInt64& aObject1, const nsInt64& aObject2) {
-    return nsInt64(aObject1) /= aObject2;
-}
-
-/**
- * Compute the modulus of two 64-bit integers
- */
-inline const nsInt64
-operator %(const nsInt64& aObject1, const nsInt64& aObject2) {
-    return nsInt64(aObject1) %= aObject2;
-}
-
-/**
- * Determine if two 64-bit integers are equal
- */
-inline PRBool
-operator ==(const nsInt64& aObject1, const nsInt64& aObject2) {
-    return LL_EQ(aObject1.mValue, aObject2.mValue);
-}
-
-/**
- * Determine if two 64-bit integers are not equal
- */
-inline PRBool
-operator !=(const nsInt64& aObject1, const nsInt64& aObject2) {
-    return LL_NE(aObject1.mValue, aObject2.mValue);
-}
-
-/**
- * Determine if one 64-bit integer is strictly greater than another, using signed values
- */
-inline PRBool
-operator >(const nsInt64& aObject1, const nsInt64& aObject2) {
-    return LL_CMP(aObject1.mValue, >, aObject2.mValue);
-}
-
-/**
- * Determine if one 64-bit integer is greater than or equal to another, using signed values
- */
-inline PRBool
-operator >=(const nsInt64& aObject1, const nsInt64& aObject2) {
-    return LL_CMP(aObject1.mValue, >=, aObject2.mValue);
-}
-
-/**
- * Determine if one 64-bit integer is strictly less than another, using signed values
- */
-inline PRBool 
-operator <(const nsInt64& aObject1, const nsInt64& aObject2) {
-    return LL_CMP(aObject1.mValue, <, aObject2.mValue);
-}
-
-/**
- * Determine if one 64-bit integers is less than or equal to another, using signed values
- */
-inline PRBool
-operator <=(const nsInt64& aObject1, const nsInt64& aObject2) {
-    return LL_CMP(aObject1.mValue, <=, aObject2.mValue);
-}
-
-/**
- * Perform a bitwise AND of two 64-bit integers
- */
-inline const nsInt64
-operator &(const nsInt64& aObject1, const nsInt64& aObject2) {
-    return nsInt64(aObject1) &= aObject2;
-}
-
-/**
- * Perform a bitwise OR of two 64-bit integers
- */
-inline const nsInt64
-operator |(const nsInt64& aObject1, const nsInt64& aObject2) {
-    return nsInt64(aObject1) |= aObject2;
-}
-
-/**
- * Perform a bitwise XOR of two 64-bit integers
- */
-inline const nsInt64
-operator ^(const nsInt64& aObject1, const nsInt64& aObject2) {
-    return nsInt64(aObject1) ^= aObject2;
-}
-
-
-#endif // nsInt64_h__

mozilla/xpcom/ds/nsObserver.cpp

@@ -1,92 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#define NS_IMPL_IDS
-#include "pratom.h"
-#include "nsIFactory.h"
-#include "nsIServiceManager.h"
-#include "nsRepository.h"
-#include "nsIObserver.h"
-#include "nsObserver.h"
-#include "nsString.h"
-
-static NS_DEFINE_CID(kObserverCID, NS_OBSERVER_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-// nsObserver Implementation
-
-
-NS_IMPL_AGGREGATED(nsObserver)
-
-NS_COM nsresult NS_NewObserver(nsIObserver** anObserver, nsISupports* outer)
-{
-    return nsObserver::Create(outer, NS_GET_IID(nsIObserver), (void**)anObserver);
-}
-
-NS_METHOD
-nsObserver::Create(nsISupports* outer, const nsIID& aIID, void* *anObserver)
-{
-    NS_ENSURE_ARG_POINTER(anObserver);
-	 NS_ENSURE_PROPER_AGGREGATION(outer, aIID);
-
-    nsObserver* it = new nsObserver(outer);
-    if (it == NULL)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    nsresult rv = it->AggregatedQueryInterface(aIID, anObserver);
-    if (NS_FAILED(rv)) {
-        delete it;
-        return rv;
-    }
-    return rv;
-}
-
-nsObserver::nsObserver(nsISupports* outer)
-{
-    NS_INIT_AGGREGATED(outer);
-}
-
-nsObserver::~nsObserver(void)
-{
-}
-
-NS_IMETHODIMP
-nsObserver::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr)
-{
-    NS_ENSURE_ARG_POINTER(aInstancePtr);
-
-    if (aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID()))
-	     *aInstancePtr = GetInner();
-	 else if(aIID.Equals(nsIObserver::GetIID()))
-	     *aInstancePtr = NS_STATIC_CAST(nsIObserver*, this);
-	 else {
-	     *aInstancePtr = nsnull;
-		  return NS_NOINTERFACE;
-	 }
-
-	 NS_ADDREF((nsISupports*)*aInstancePtr);
-	 return NS_OK;
-}
-
-NS_IMETHODIMP
-nsObserver::Observe( nsISupports *, const PRUnichar *, const PRUnichar * ) {
-    nsresult rv = NS_OK;
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/xpcom/ds/nsObserver.h

@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL. You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All Rights
- * Reserved.
- */
-
-#ifndef nsObserver_h___
-#define nsObserver_h___
-
-#include "nsIObserver.h"
-#include "nsAgg.h"
-
-// {DB242E03-E4D9-11d2-9DDE-000064657374}
-#define NS_OBSERVER_CID \
-    { 0xdb242e03, 0xe4d9, 0x11d2, { 0x9d, 0xde, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }
-
-class nsObserver : public nsIObserver {
-public:
-
-    NS_DEFINE_STATIC_CID_ACCESSOR( NS_OBSERVER_CID )
- 
-    NS_DECL_NSIOBSERVER
- 
-    nsObserver(nsISupports* outer);
-    virtual ~nsObserver(void);
-
-    static NS_METHOD
-    Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr);
-
-    NS_DECL_AGGREGATED
-
-private:
-
-};
-
-extern NS_COM nsresult NS_NewObserver(nsIObserver** anObserver, nsISupports* outer = NULL);
-
-#endif /* nsObserver_h___ */

mozilla/xpcom/ds/nsObserverList.cpp

@@ -1,133 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#define NS_IMPL_IDS
-#include "pratom.h"
-#include "nsIObserverList.h"
-#include "nsObserverList.h"
-#include "nsString.h"
-#include "nsAutoLock.h"
-
-
-#define NS_AUTOLOCK(__monitor) nsAutoLock __lock(__monitor)
-
-static NS_DEFINE_CID(kObserverListCID, NS_OBSERVERLIST_CID);
-
-
-////////////////////////////////////////////////////////////////////////////////
-// nsObserverList Implementation
-
-
-NS_IMPL_ISUPPORTS1(nsObserverList, nsIObserverList)
-
-NS_COM nsresult NS_NewObserverList(nsIObserverList** anObserverList)
-{
-
-    if (anObserverList == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }  
-    nsObserverList* it = new nsObserverList();
-
-    if (it == 0) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    return it->QueryInterface(NS_GET_IID(nsIObserverList), (void **) anObserverList);
-}
-
-nsObserverList::nsObserverList()
-    : mLock(nsnull),
-        mObserverList(NULL)
-{
-    NS_INIT_REFCNT();
-    mLock = PR_NewLock();
-}
-
-nsObserverList::~nsObserverList(void)
-{
-    PR_DestroyLock(mLock);
-    NS_IF_RELEASE(mObserverList);
-}
-
-
-nsresult nsObserverList::AddObserver(nsIObserver** anObserver)
-{
-	nsresult rv;
-	PRBool inserted;
-    
-	NS_AUTOLOCK(mLock);
-
-    if (anObserver == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }  
-
-	if(!mObserverList) {
-        rv = NS_NewISupportsArray(&mObserverList);
-		if (NS_FAILED(rv)) return rv;
-    }
-
-	if(*anObserver) {
-		inserted = mObserverList->AppendElement(*anObserver); 
-		return inserted ? NS_OK : NS_ERROR_FAILURE;
-    }
-
-	return NS_ERROR_FAILURE;
-}
-
-nsresult nsObserverList::RemoveObserver(nsIObserver** anObserver)
-{
-	PRBool removed;
-
- 	NS_AUTOLOCK(mLock);
-
-    if (anObserver == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }  
-
-    if(!mObserverList) {
-        return NS_ERROR_FAILURE;
-    }
-
-	if(*anObserver) {
-		removed = mObserverList->RemoveElement(*anObserver);  
-		return removed ? NS_OK : NS_ERROR_FAILURE;
-    }
-
-    return NS_ERROR_FAILURE;
-
-}
-
-NS_IMETHODIMP nsObserverList::EnumerateObserverList(nsIEnumerator** anEnumerator)
-{
-	NS_AUTOLOCK(mLock);
-
-    if (anEnumerator == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    if(!mObserverList) {
-        return NS_ERROR_FAILURE;
-    }
-    
- 	return mObserverList->Enumerate(anEnumerator);
-}
-

mozilla/xpcom/ds/nsObserverList.h

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL. You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All Rights
- * Reserved.
- */
-
-#ifndef nsObserverList_h___
-#define nsObserverList_h___
-
-#include "nsIObserverList.h"
-#include "nsIEnumerator.h"
-#include "nsISupportsArray.h"
-
-
-class nsObserverList : public nsIObserverList {
-public:
-
-    NS_IMETHOD AddObserver(nsIObserver** anObserver);
-    NS_IMETHOD RemoveObserver(nsIObserver** anObserver);
-
-	NS_IMETHOD EnumerateObserverList(nsIEnumerator** anEnumerator);
-
-    nsObserverList();
-    virtual ~nsObserverList(void);
-
-    // This is ObserverList monitor object.
-    PRLock* mLock;
-     
-    NS_DECL_ISUPPORTS
-
-   
-private:
-
- 	nsISupportsArray *mObserverList;
-
-};
-
-
-#endif /* nsObserverList_h___ */

mozilla/xpcom/ds/nsObserverService.cpp

@@ -1,249 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#define NS_IMPL_IDS
-#include "prlock.h"
-#include "nsIFactory.h"
-#include "nsIServiceManager.h"
-#include "nsRepository.h"
-#include "nsIObserverService.h"
-#include "nsObserverService.h"
-#include "nsIObserverList.h"
-#include "nsObserverList.h"
-#include "nsHashtable.h"
-#include "nsString.h"
-
-static NS_DEFINE_CID(kObserverServiceCID, NS_OBSERVERSERVICE_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-static nsObserverService* gObserverService = nsnull; // The one-and-only ObserverService
-
-////////////////////////////////////////////////////////////////////////////////
-// nsObserverService Implementation
-
-
-NS_IMPL_ISUPPORTS1(nsObserverService, nsIObserverService)
-
-NS_COM nsresult NS_NewObserverService(nsIObserverService** anObserverService)
-{
-    return nsObserverService::GetObserverService(anObserverService);
-}
-
-nsObserverService::nsObserverService()
-    : mObserverTopicTable(NULL)
-{
-    NS_INIT_REFCNT();
-    mObserverTopicTable = nsnull;
-}
-
-nsObserverService::~nsObserverService(void)
-{
-    if(mObserverTopicTable)
-        delete mObserverTopicTable;
-    gObserverService = nsnull;
-}
-
-NS_METHOD
-nsObserverService::Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr)
-{
-    nsresult rv;
-    nsObserverService* os = new nsObserverService();
-    if (os == NULL)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(os);
-    rv = os->QueryInterface(aIID, aInstancePtr);
-    NS_RELEASE(os);
-    return rv;
-}
-
-nsresult nsObserverService::GetObserverService(nsIObserverService** anObserverService)
-{
-    if (! gObserverService) {
-        nsObserverService* it = new nsObserverService();
-        if (! it)
-            return NS_ERROR_OUT_OF_MEMORY;
-        gObserverService = it;
-    }
-
-    NS_ADDREF(gObserverService);
-    *anObserverService = gObserverService;
-    return NS_OK;
-}
-
-static PRBool
-ReleaseObserverList(nsHashKey *aKey, void *aData, void* closure)
-{
-    nsIObserverList* observerList = NS_STATIC_CAST(nsIObserverList*, aData);
-    NS_RELEASE(observerList);
-    return PR_TRUE;
-}
-
-nsresult nsObserverService::GetObserverList(const nsString& aTopic, nsIObserverList** anObserverList)
-{
-    if (anObserverList == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-	
-	if(mObserverTopicTable == NULL) {
-        mObserverTopicTable = new nsObjectHashtable(nsnull, nsnull,   // should never be cloned
-                                                    ReleaseObserverList, nsnull,
-                                                    256, PR_TRUE);
-        if (mObserverTopicTable == NULL)
-            return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-
-	 nsStringKey key(aTopic);
-
-    nsIObserverList *topicObservers = nsnull;
-    if (mObserverTopicTable->Exists(&key)) {
-        topicObservers = (nsIObserverList *) mObserverTopicTable->Get(&key);
-        if (topicObservers != NULL) {
-	        *anObserverList = topicObservers;	
-        } else {
-            NS_NewObserverList(&topicObservers);
-            mObserverTopicTable->Put(&key, topicObservers);
-        }
-    } else {
-        NS_NewObserverList(&topicObservers);
-        *anObserverList = topicObservers;
-        mObserverTopicTable->Put(&key, topicObservers);
-
-    }
-
-	return NS_OK;
-}
-
-nsresult nsObserverService::AddObserver(nsIObserver* anObserver, const PRUnichar* aTopic)
-{
-	nsIObserverList* anObserverList;
-	nsresult rv;
-
-    if (anObserver == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-	if (aTopic == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    nsAutoString topic(aTopic);
-	rv = GetObserverList(topic, &anObserverList);
-	if (NS_FAILED(rv)) return rv;
-
-	if (anObserverList) {
-        return anObserverList->AddObserver(&anObserver);
-    }
- 	
-	return NS_ERROR_FAILURE;
-}
-
-nsresult nsObserverService::RemoveObserver(nsIObserver* anObserver, const PRUnichar* aTopic)
-{
-	nsIObserverList* anObserverList;
-	nsresult rv;
-
-    if (anObserver == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-	if (aTopic == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    nsAutoString topic(aTopic);
-	rv = GetObserverList(topic, &anObserverList);
-	if (NS_FAILED(rv)) return rv;
-
-	if (anObserverList) {
-        return anObserverList->RemoveObserver(&anObserver);
-    }
- 	
-	return NS_ERROR_FAILURE;
-}
-
-nsresult nsObserverService::EnumerateObserverList(const PRUnichar* aTopic, nsIEnumerator** anEnumerator)
-{
-	nsIObserverList* anObserverList;
-	nsresult rv;
-
-    if (anEnumerator == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-	if (aTopic == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    nsAutoString topic(aTopic);
-	rv = GetObserverList(topic, &anObserverList);
-	if (NS_FAILED(rv)) return rv;
-
-	if (anObserverList) {
-        return anObserverList->EnumerateObserverList(anEnumerator);
-    }
- 	
-	return NS_ERROR_FAILURE;
-}
-
-// Enumerate observers of aTopic and call Observe on each.
-nsresult nsObserverService::Notify( nsISupports *aSubject,
-                                    const PRUnichar *aTopic,
-                                    const PRUnichar *someData ) {
-    nsresult rv = NS_OK;
-    nsIEnumerator *observers;
-    // Get observer list enumerator.
-    rv = this->EnumerateObserverList( aTopic, &observers );
-    if ( NS_SUCCEEDED( rv ) ) {
-        // Go to start of observer list.
-        rv = observers->First();
-        // Continue until error or end of list.
-        while ( observers->IsDone() != NS_OK && NS_SUCCEEDED(rv) ) {
-            // Get current item (observer).
-            nsISupports *base;
-            rv = observers->CurrentItem( &base );
-            if ( NS_SUCCEEDED( rv ) ) {                           
-                // Convert item to nsIObserver.
-                nsIObserver *observer;
-                rv = base->QueryInterface( nsIObserver::GetIID(), (void**)&observer );
-                if ( NS_SUCCEEDED( rv ) && observer ) {
-                    // Tell the observer what's up.
-                    observer->Observe( aSubject, aTopic, someData );
-                    // Release the observer.
-                    observer->Release();
-                }
-            }
-            // Go on to next observer in list.
-            rv = observers->Next();
-        }
-        // Release the observer list.
-        observers->Release();
-        rv = NS_OK;
-    }
-    return rv;
-}
-////////////////////////////////////////////////////////////////////////////////
-

mozilla/xpcom/ds/nsObserverService.h

@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL. You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All Rights
- * Reserved.
- */
-
-#ifndef nsObserverService_h___
-#define nsObserverService_h___
-
-#include "nsIObserverService.h"
-#include "nsIObserverList.h"
-
-class nsObjectHashtable;
-class nsString;
-
-// {D07F5195-E3D1-11d2-8ACD-00105A1B8860}
-#define NS_OBSERVERSERVICE_CID \
-    { 0xd07f5195, 0xe3d1, 0x11d2, { 0x8a, 0xcd, 0x0, 0x10, 0x5a, 0x1b, 0x88, 0x60 } }
-
-class nsObserverService : public nsIObserverService {
-public:
-    NS_DEFINE_STATIC_CID_ACCESSOR( NS_OBSERVERSERVICE_CID )
-
-	static nsresult GetObserverService(nsIObserverService** anObserverService);
-    
-    NS_DECL_NSIOBSERVERSERVICE
-   
-  nsObserverService();
-  virtual ~nsObserverService(void);
-     
-  NS_DECL_ISUPPORTS
-
-  static NS_METHOD
-  Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr);
-
-private:
-	
-  NS_IMETHOD GetObserverList(const nsString& aTopic, nsIObserverList** anObserverList);
-
-  nsObjectHashtable* mObserverTopicTable;
-
-};
-
-#endif /* nsObserverService_h___ */