mozilla-check_return.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Fri, 20 Jan 2017 23:56:59 +0100
changeset 935 9ae2b79d3bb1
parent 909 c6717354928b
permissions -rw-r--r--
prepare FF 51 -> 51.0b14
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
909
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# User Wolfgang Rosenauer <wr@rosenauer.org>
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
# Parent  5f8b5e8163ece92dc819896dd52b9dbf5f524fe3
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
diff --git a/media/libstagefright/binding/include/mp4_demuxer/ByteWriter.h b/media/libstagefright/binding/include/mp4_demuxer/ByteWriter.h
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
--- a/media/libstagefright/binding/include/mp4_demuxer/ByteWriter.h
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
+++ b/media/libstagefright/binding/include/mp4_demuxer/ByteWriter.h
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
@@ -19,57 +19,64 @@ public:
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
   {
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
   }
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
   ~ByteWriter()
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
   {
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
   }
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
 
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
   void WriteU8(uint8_t aByte)
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
   {
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
-    mPtr.append(aByte);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
+    bool rv;
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
+    rv = mPtr.append(aByte);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
   }
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
 
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
   void WriteU16(uint16_t aShort)
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
   {
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
     uint8_t c[2];
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
+    bool rv;
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
     mozilla::BigEndian::writeUint16(&c[0], aShort);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
-    mPtr.append(&c[0], 2);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
+    rv = mPtr.append(&c[0], 2);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    29
   }
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    30
 
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    31
   void WriteU32(uint32_t aLong)
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    32
   {
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    33
     uint8_t c[4];
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    34
+    bool rv;
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    35
     mozilla::BigEndian::writeUint32(&c[0], aLong);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    36
-    mPtr.append(&c[0], 4);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    37
+    rv = mPtr.append(&c[0], 4);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    38
   }
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    39
 
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    40
   void Write32(int32_t aLong)
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    41
   {
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    42
     uint8_t c[4];
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    43
+    bool rv;
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    44
     mozilla::BigEndian::writeInt32(&c[0], aLong);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    45
-    mPtr.append(&c[0], 4);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    46
+    rv = mPtr.append(&c[0], 4);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    47
   }
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    48
 
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    49
   void WriteU64(uint64_t aLongLong)
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    50
   {
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    51
     uint8_t c[8];
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    52
+    bool rv;
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    53
     mozilla::BigEndian::writeUint64(&c[0], aLongLong);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    54
-    mPtr.append(&c[0], 8);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    55
+    rv = mPtr.append(&c[0], 8);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    56
   }
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    57
 
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    58
   void Write64(int64_t aLongLong)
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    59
   {
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    60
     uint8_t c[8];
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    61
+    bool rv;
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    62
     mozilla::BigEndian::writeInt64(&c[0], aLongLong);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    63
-    mPtr.append(&c[0], 8);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    64
+    rv = mPtr.append(&c[0], 8);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    65
   }
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    66
 
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    67
   void Write(const uint8_t* aSrc, size_t aCount)
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    68
   {
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    69
-    mPtr.append(aSrc, aCount);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    70
+    bool rv;
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    71
+    rv = mPtr.append(aSrc, aCount);
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    72
   }
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    73
 
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    74
 private:
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    75
   mozilla::Vector<uint8_t>& mPtr;
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    76
 };
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    77
 }
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    78
 
c6717354928b Firefox 46.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    79
 #endif