osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

De-camel-ize "Wireshark" in a few places. 

The _wslua_main struct / WireShark class appears to have never been
used, so remove it.

Change-Id: Id80fb2c2065accedf632ea4cc467d566d10870de
Reviewed-on: https://code.wireshark.org/review/35480
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Gerald Combs 2019-12-17 13:32:43 -08:00 committed by Alexis La Goutte
parent c656affc34
commit d614ade782
5 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/asn1/h248/h248v3.asn
View File

@ -177,7 +177,7 @@ BEGIN
commandReply [3] SEQUENCE OF CommandReply
}
-- WireShark Specific
-- Wireshark Specific
ContextIDinList ::= INTEGER(0..4294967295)
ContextRequest ::= SEQUENCE
@ -189,7 +189,7 @@ BEGIN
iepscallind [3] BOOLEAN OPTIONAL,
contextProp [4] SEQUENCE OF PropertyParm OPTIONAL,
-- WireShark Specific
-- Wireshark Specific
-- contextList [5] SEQUENCE OF ContextID OPTIONAL
contextList [5] SEQUENCE OF ContextIDinList OPTIONAL
-- Currently the way that WS tracing code's persistent data is

1
epan/wslua/wslua.h
View File

@ -345,7 +345,6 @@ typedef tvbparse_t* Parser;
typedef tvbparse_wanted_t* Rule;
typedef tvbparse_elem_t* Node;
typedef tvbparse_action_t* Shortcut;
typedef struct _wslua_main* WireShark;
typedef struct _wslua_dir* Dir;
typedef struct _wslua_private_table* PrivateTable;
typedef gchar* Struct;

4
ui/qt/models/profile_model.cpp
View File

@ -1076,7 +1076,7 @@ bool ProfileModel::exportProfiles(QString filename, QModelIndexList items, QStri
return false;
}
if (WireSharkZipHelper::zip(filename, files, gchar_free_to_qstring(get_profiles_dir()) + QDir::separator()) )
if (WiresharkZipHelper::zip(filename, files, gchar_free_to_qstring(get_profiles_dir()) + QDir::separator()) )
return true;
return false;
@ -1113,7 +1113,7 @@ int ProfileModel::importProfilesFromZip(QString filename, int * skippedCnt, QStr
int cnt = 0;
if (dir.isValid())
{
WireSharkZipHelper::unzip(filename, dir.path(), &ProfileModel::acceptFile, &ProfileModel::cleanName);
WiresharkZipHelper::unzip(filename, dir.path(), &ProfileModel::acceptFile, &ProfileModel::cleanName);
cnt = importProfilesFromDir(dir.path(), skippedCnt, true, result);
}

8
ui/qt/utils/wireshark_zip_helper.cpp
View File

@ -32,7 +32,7 @@
#include <QDateTime>
#include <QMap>
bool WireSharkZipHelper::unzip(QString zipFile, QString directory, bool (*fileCheck)(QString, int), QString (*cleanName)(QString))
bool WiresharkZipHelper::unzip(QString zipFile, QString directory, bool (*fileCheck)(QString, int), QString (*cleanName)(QString))
{
unzFile uf = Q_NULLPTR;
QFileInfo fi(zipFile);
@ -176,7 +176,7 @@ unsigned long qDateToDosDate(QDateTime time)
return dosDate << 16 | dosTime;
}
void WireSharkZipHelper::addFileToZip(zipFile zf, QString filepath, QString fileInZip)
void WiresharkZipHelper::addFileToZip(zipFile zf, QString filepath, QString fileInZip)
{
QFileInfo fi(filepath);
zip_fileinfo zi;
@ -217,7 +217,7 @@ void WireSharkZipHelper::addFileToZip(zipFile zf, QString filepath, QString file
zipCloseFileInZip(zf);
}
bool WireSharkZipHelper::zip(QString fileName, QStringList files, QString relativeTo)
bool WiresharkZipHelper::zip(QString fileName, QStringList files, QString relativeTo)
{
QFileInfo fi(fileName);
@ -237,7 +237,7 @@ bool WireSharkZipHelper::zip(QString fileName, QStringList files, QString relati
while (fileInZip.length() > 0 && fileInZip.startsWith(QDir::separator()))
fileInZip = fileInZip.right(fileInZip.length() - 1);
WireSharkZipHelper::addFileToZip(zf, sf.absoluteFilePath(), fileInZip);
WiresharkZipHelper::addFileToZip(zf, sf.absoluteFilePath(), fileInZip);
}

2
ui/qt/utils/wireshark_zip_helper.h
View File

@ -20,7 +20,7 @@
#include "minizip/zip.h"
class WireSharkZipHelper
class WiresharkZipHelper
{
public:
static bool zip(QString zipFile, QStringList files, QString relativeTo = QString());