Merge bustage fixes from mozilla-central into electrolysis.
authorBenjamin Smedberg <benjamin@smedbergs.us>
Wed, 10 Feb 2010 09:21:50 -0500
changeset 46652 834671736c6b47c1d27b4e8a6be4fbec1ab7d437
parent 46651 3de45fce376dfe8fb053dc9ffa46d7405d83c12f (current diff)
parent 38040 75beeb8eed5eda3d8df78e3648c506dbcfe73803 (diff)
child 46653 5603d4b9af300439da13f66b6e7ab39b87e76be6
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
milestone1.9.3a2pre
Merge bustage fixes from mozilla-central into electrolysis.
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -334,16 +334,17 @@
 @BINPATH@/components/nsFormAutoComplete.js
 @BINPATH@/components/contentSecurityPolicy.js
 #ifdef XP_MACOSX
 @BINPATH@/components/libalerts_s.dylib
 #endif
 #ifdef MOZ_ENABLE_DBUS
 @BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
 #endif
+@BINPATH@/components/nsINIProcessor.js
 
 ; Modules
 @BINPATH@/modules/*
 
 ; Safe Browsing
 @BINPATH@/components/nsSafebrowsingApplication.js
 @BINPATH@/components/nsUrlClassifierListManager.js
 @BINPATH@/components/nsUrlClassifierLib.js
--- a/config/system-headers
+++ b/config/system-headers
@@ -1004,17 +1004,17 @@ libsn/sn-monitor.h
 libsn/sn-util.h
 #endif
 #if MOZ_NATIVE_HUNSPELL==1
 hunspell.hxx
 #endif
 #if MOZ_NATIVE_BZ2==1
 bzlib.h
 #endif
-#if (MOZ_PLATFORM_MAEMO == 5)
+#if MOZ_PLATFORM_MAEMO==5
 hildon-uri.h
 hildon-mime.h
 hildon-file-chooser-dialog.h
 libosso.h
 osso-mem.h
 #endif
 #ifdef MOZ_ENABLE_GIO
 gio/gio.h
--- a/content/media/ogg/nsChannelReader.h
+++ b/content/media/ogg/nsChannelReader.h
@@ -49,17 +49,17 @@ class nsMediaDecoder;
 
 class nsChannelReader : public OggPlayReader
 {
 public:
   nsChannelReader();
   ~nsChannelReader();
 
   /**
-   * Initialize the reader with the edia stream.
+   * Initialize the reader with the media stream.
    * This takes ownership of aStream.
    */
   void Init(nsMediaStream* aStream);
 
   nsMediaStream* Stream() { return mStream; }
 
   // Set the time of the last frame. This is returned in duration() to
   // liboggplay. Call with decoder lock obtained so that liboggplay cannot
--- a/js/src/config/system-headers
+++ b/js/src/config/system-headers
@@ -1004,17 +1004,17 @@ libsn/sn-monitor.h
 libsn/sn-util.h
 #endif
 #if MOZ_NATIVE_HUNSPELL==1
 hunspell.hxx
 #endif
 #if MOZ_NATIVE_BZ2==1
 bzlib.h
 #endif
-#if (MOZ_PLATFORM_MAEMO == 5)
+#if MOZ_PLATFORM_MAEMO==5
 hildon-uri.h
 hildon-mime.h
 hildon-file-chooser-dialog.h
 libosso.h
 osso-mem.h
 #endif
 #ifdef MOZ_ENABLE_GIO
 gio/gio.h
--- a/xpcom/glue/nsCRTGlue.cpp
+++ b/xpcom/glue/nsCRTGlue.cpp
@@ -86,17 +86,17 @@ NS_strtok(const char *delims, char **str
         *str = ++i;
         return ret;
       }
     }
     ++i;
   } while (*i);
 
   *str = NULL;
-  return NULL;
+  return ret;
 }
 
 PRUint32
 NS_strlen(const PRUnichar *aString)
 {
   const PRUnichar *end;
 
   for (end = aString; *end; ++end) {
--- a/xpcom/glue/nsINIParser.cpp
+++ b/xpcom/glue/nsINIParser.cpp
@@ -192,17 +192,17 @@ nsINIParser::InitFromFILE(FILE *fd)
         if (!currSection) {
             // If we haven't found a section header (or we found a malformed
             // section header), don't bother parsing this line.
             continue;
         }
 
         char *key = token;
         char *e = NS_strtok(kEquals, &token);
-        if (!e)
+        if (!e || !token)
             continue;
 
         INIValue *v;
         if (!mSections.Get(currSection, &v)) {
             v = new INIValue(key, token);
             if (!v)
                 return NS_ERROR_OUT_OF_MEMORY;