summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2015-02-05 21:31:06 -0500
committerJeff Morriss <jeff.morriss.ws@gmail.com>2015-02-06 02:34:30 +0000
commitd6ebb82ed24bb556d18d70bd2eb77947c07b94ff (patch)
treeb9c521c7cebf4b636fc683093747d02ec291e7b6
parent61e3bdc7ced87aae836716911525187cad4c4946 (diff)
downloadwireshark-d6ebb82ed24bb556d18d70bd2eb77947c07b94ff.tar.gz
(Trivial) Reformat some.
Change-Id: I1bed28c33d1942b9d8ee8ef341d7017d2df21f37 Reviewed-on: https://code.wireshark.org/review/6977 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-rw-r--r--epan/diam_dict.l40
1 files changed, 30 insertions, 10 deletions
diff --git a/epan/diam_dict.l b/epan/diam_dict.l
index 43fbcd9c26..c89a02dd21 100644
--- a/epan/diam_dict.l
+++ b/epan/diam_dict.l
@@ -555,11 +555,15 @@ static unsigned size_strbuf = 8192;
static unsigned len_strbuf = 0;
extern void ddict_unused(void);
-void ddict_unused(void) {
+void
+ddict_unused(void)
+{
yy_top_state();
}
-static void append_to_buffer(const char* txt, unsigned len) {
+static void
+append_to_buffer(const char* txt, unsigned len)
+{
if (strbuf == NULL) {
read_ptr = write_ptr = strbuf = (char*)g_malloc(size_strbuf);
@@ -575,7 +579,9 @@ static void append_to_buffer(const char* txt, unsigned len) {
}
-static size_t file_input(char* buf, size_t max) {
+static size_t
+file_input(char* buf, size_t max)
+{
size_t read_cnt;
read_cnt = fread(buf,1,max,yyin);
@@ -590,7 +596,9 @@ static size_t file_input(char* buf, size_t max) {
}
-static size_t string_input(char* buf, size_t max) {
+static size_t
+string_input(char* buf, size_t max)
+{
if (read_ptr >= write_ptr ) {
return YY_NULL;
} else if ( read_ptr + max > write_ptr ) {
@@ -603,7 +611,9 @@ static size_t string_input(char* buf, size_t max) {
return max;
}
-static FILE* ddict_open(const char* system_directory, const char* filename) {
+static FILE *
+ddict_open(const char* system_directory, const char* filename)
+{
FILE* fh;
char* fname;
if (system_directory) {
@@ -623,7 +633,9 @@ static FILE* ddict_open(const char* system_directory, const char* filename) {
return fh;
}
-ddict_t* ddict_scan(const char* system_directory, const char* filename, int dbg) {
+ddict_t *
+ddict_scan(const char* system_directory, const char* filename, int dbg)
+{
debugging = dbg;
@@ -684,7 +696,9 @@ ddict_t* ddict_scan(const char* system_directory, const char* filename, int dbg)
return dict;
}
-void ddict_free(ddict_t* d) {
+void
+ddict_free(ddict_t* d)
+{
ddict_application_t *p, *pn;
ddict_vendor_t *v, *vn;
ddict_cmd_t *c, *cn;
@@ -739,7 +753,9 @@ void ddict_free(ddict_t* d) {
g_free(d);
}
-void ddict_print(FILE* fh, ddict_t* d) {
+void
+ddict_print(FILE* fh, ddict_t* d)
+{
ddict_application_t* p;
ddict_vendor_t* v;
ddict_cmd_t* c;
@@ -801,12 +817,16 @@ void ddict_print(FILE* fh, ddict_t* d) {
* warnings by the Windows VC compiler).
*/
-int yywrap(void) {
+int
+yywrap(void)
+{
return 1;
}
#ifdef TEST_DIAM_DICT_STANDALONE
-int main(int argc, char** argv) {
+int
+main(int argc, char** argv)
+{
ddict_t* d;
char* dname = NULL;
char* fname;