mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
5ee21d6d3f
This patch was mostly generated by running the following scripts on the codebase, with some
manual changes made afterwards:
# static_assert.sh
#!/bin/bash
# Command to convert an NSPR integer type to the equivalent standard integer type
function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
! -wholename "*security/nss*" \
! -wholename "*/.hg*" \
! -wholename "obj-ff-dbg*" \
! -name nsXPCOMCID.h \
! -name prtypes.h \
-type f \
\( -iname "*.cpp" \
-o -iname "*.h" \
-o -iname "*.cc" \
-o -iname "*.mm" \) | \
xargs -n 1 `dirname $0`/assert_replacer.py #sed -i -e "s/\b$1\b/$2/g"
}
convert MOZ_STATIC_ASSERT static_assert
hg rev --no-backup mfbt/Assertions.h \
media/webrtc/signaling/src/sipcc/core/includes/ccapi.h \
modules/libmar/src/mar_private.h \
modules/libmar/src/mar.h
# assert_replacer.py
#!/usr/bin/python
import sys
import re
pattern = re.compile(r"\bMOZ_STATIC_ASSERT\b")
def replaceInPlace(fname):
print fname
f = open(fname, "rw+")
lines = f.readlines()
for i in range(0, len(lines)):
while True:
index = re.search(pattern, lines[i])
if index != None:
index = index.start()
lines[i] = lines[i][0:index] + "static_assert" + lines[i][index+len("MOZ_STATIC_ASSERT"):]
for j in range(i + 1, len(lines)):
if lines[j].find(" ", index) == index:
lines[j] = lines[j][0:index] + lines[j][index+4:]
else:
break
else:
break
f.seek(0, 0)
f.truncate()
f.write("".join(lines))
f.close()
argc = len(sys.argv)
for i in range(1, argc):
replaceInPlace(sys.argv[i])
--HG--
extra : rebase_source : 4b4a4047d82f2c205b9fad8d56dfc3f1afc0b045
|
||
|---|---|---|
| .. | ||
| android | ||
| Makefile.in | ||
| moz.build | ||
| npapi.h | ||
| npfunctions.h | ||
| npruntime.h | ||
| nptypes.h | ||
| nsIHTTPHeaderListener.idl | ||
| nsIPluginDocument.idl | ||
| nsIPluginHost.idl | ||
| nsIPluginInputStream.idl | ||
| nsIPluginInstanceOwner.idl | ||
| nsIPluginTag.idl | ||
| nsIPluginTagInfo.idl | ||
| nsJSNPRuntime.cpp | ||
| nsJSNPRuntime.h | ||
| nsNPAPIPlugin.cpp | ||
| nsNPAPIPlugin.h | ||
| nsNPAPIPluginInstance.cpp | ||
| nsNPAPIPluginInstance.h | ||
| nsNPAPIPluginStreamListener.cpp | ||
| nsNPAPIPluginStreamListener.h | ||
| nsPluginDirServiceProvider.cpp | ||
| nsPluginDirServiceProvider.h | ||
| nsPluginHost.cpp | ||
| nsPluginHost.h | ||
| nsPluginInstanceOwner.cpp | ||
| nsPluginInstanceOwner.h | ||
| nsPluginLogging.h | ||
| nsPluginManifestLineReader.h | ||
| nsPluginModule.cpp | ||
| nsPluginNativeWindow.cpp | ||
| nsPluginNativeWindow.h | ||
| nsPluginNativeWindowGtk2.cpp | ||
| nsPluginNativeWindowOS2.cpp | ||
| nsPluginNativeWindowQt.cpp | ||
| nsPluginNativeWindowWin.cpp | ||
| nsPluginPlayPreviewInfo.cpp | ||
| nsPluginPlayPreviewInfo.h | ||
| nspluginroot.idl | ||
| nsPluginsCID.h | ||
| nsPluginsDir.h | ||
| nsPluginsDirDarwin.cpp | ||
| nsPluginsDirOS2.cpp | ||
| nsPluginsDirUnix.cpp | ||
| nsPluginsDirUtils.h | ||
| nsPluginsDirWin.cpp | ||
| nsPluginStreamListenerPeer.cpp | ||
| nsPluginStreamListenerPeer.h | ||
| nsPluginTags.cpp | ||
| nsPluginTags.h | ||
| PluginPRLibrary.cpp | ||
| PluginPRLibrary.h | ||