mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 14:48:21 +00:00
binpac: Rename files in patches to match current directory structure
This commit is contained in:
parent
c010152340
commit
6034744a0c
9 changed files with 132 additions and 134 deletions
|
@ -1,7 +1,7 @@
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_expr.cc bro-1.2.1-ssl-binpac/src/binpac/pac_expr.cc
|
diff -urN bro-1.2.1-orig/src/pac_expr.cc bro-1.2.1-ssl-binpac/src/pac_expr.cc
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_expr.cc 2006-07-26 15:02:40.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_expr.cc 2006-07-26 15:02:40.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_expr.cc 2007-05-04 14:31:11.728494000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_expr.cc 2007-05-04 14:31:11.728494000 -0700
|
||||||
@@ -776,6 +776,27 @@
|
@@ -776,2 +776,2 @@
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_expr.cc bro-1.2.1-ssl-binpac/src/binpac/pac_expr.cc
|
diff -urN bro-1.2.1-orig/src/pac_expr.cc bro-1.2.1-ssl-binpac/src/pac_expr.cc
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_expr.cc 2006-07-26 15:02:40.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_expr.cc 2006-07-26 15:02:40.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_expr.cc 2007-05-04 14:31:11.728494000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_expr.cc 2007-05-04 14:31:11.728494000 -0700
|
||||||
@@ -245,6 +245,12 @@
|
@@ -245,6 +245,12 @@
|
||||||
out_cc->println("%s %s;",
|
out_cc->println("%s %s;",
|
||||||
val_type->DataTypeStr().c_str(),
|
val_type->DataTypeStr().c_str(),
|
||||||
|
@ -64,9 +64,9 @@ diff -urN bro-1.2.1-orig/src/binpac/pac_expr.cc bro-1.2.1-ssl-binpac/src/binpac/
|
||||||
const char* Expr::EvalExpr(Output* out_cc, Env* env)
|
const char* Expr::EvalExpr(Output* out_cc, Env* env)
|
||||||
{
|
{
|
||||||
GenEval(out_cc, env);
|
GenEval(out_cc, env);
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_expr.h bro-1.2.1-ssl-binpac/src/binpac/pac_expr.h
|
diff -urN bro-1.2.1-orig/src/pac_expr.h bro-1.2.1-ssl-binpac/src/pac_expr.h
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_expr.h 2006-07-26 15:02:39.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_expr.h 2006-07-26 15:02:39.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_expr.h 2007-05-04 14:16:31.624287000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_expr.h 2007-05-04 14:16:31.624287000 -0700
|
||||||
@@ -56,6 +56,11 @@
|
@@ -56,6 +56,11 @@
|
||||||
//
|
//
|
||||||
const char *EvalExpr(Output *out, Env *env);
|
const char *EvalExpr(Output *out, Env *env);
|
||||||
|
@ -79,9 +79,9 @@ diff -urN bro-1.2.1-orig/src/binpac/pac_expr.h bro-1.2.1-ssl-binpac/src/binpac/p
|
||||||
// Returns the set_* function of the expression.
|
// Returns the set_* function of the expression.
|
||||||
// The expression must be of form ID or x.ID.
|
// The expression must be of form ID or x.ID.
|
||||||
string SetFunc(Output *out, Env *env);
|
string SetFunc(Output *out, Env *env);
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_let.cc bro-1.2.1-ssl-binpac/src/binpac/pac_let.cc
|
diff -urN bro-1.2.1-orig/src/pac_let.cc bro-1.2.1-ssl-binpac/src/pac_let.cc
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_let.cc 2006-07-26 15:02:39.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_let.cc 2006-07-26 15:02:39.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_let.cc 2007-05-04 15:32:09.695568000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_let.cc 2007-05-04 15:32:09.695568000 -0700
|
||||||
@@ -80,7 +80,12 @@
|
@@ -80,7 +80,12 @@
|
||||||
if ( type_->attr_if_expr() )
|
if ( type_->attr_if_expr() )
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_let.cc bro-1.2.1-ssl-binpac/src/binpac/pac_let.cc
|
diff -urN bro-1.2.1-orig/src/pac_let.cc bro-1.2.1-ssl-binpac/src/pac_let.cc
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_let.cc 2006-07-26 15:02:39.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_let.cc 2006-07-26 15:02:39.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_let.cc 2007-05-04 15:32:09.695568000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_let.cc 2007-05-04 15:32:09.695568000 -0700
|
||||||
@@ -108,11 +108,6 @@
|
@@ -108,11 +108,6 @@
|
||||||
void LetField::GenEval(Output* out_cc, Env* env)
|
void LetField::GenEval(Output* out_cc, Env* env)
|
||||||
{
|
{
|
||||||
|
@ -13,9 +13,9 @@ diff -urN bro-1.2.1-orig/src/binpac/pac_let.cc bro-1.2.1-ssl-binpac/src/binpac/p
|
||||||
}
|
}
|
||||||
|
|
||||||
LetDecl::LetDecl(ID *id, Type *type, Expr *expr)
|
LetDecl::LetDecl(ID *id, Type *type, Expr *expr)
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_type.cc bro-1.2.1-ssl-binpac/src/binpac/pac_type.cc
|
diff -urN bro-1.2.1-orig/src/pac_type.cc bro-1.2.1-ssl-binpac/src/pac_type.cc
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_type.cc 2006-07-26 15:02:40.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_type.cc 2006-07-26 15:02:40.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_type.cc 2007-05-24 10:56:42.140658000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_type.cc 2007-05-24 10:56:42.140658000 -0700
|
||||||
@@ -316,9 +316,15 @@
|
@@ -316,9 +316,15 @@
|
||||||
{
|
{
|
||||||
if ( DefineValueVar() )
|
if ( DefineValueVar() )
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_record.cc bro-1.2.1-ssl-binpac/src/binpac/pac_record.cc
|
diff -urN bro-1.2.1-orig/src/pac_record.cc bro-1.2.1-ssl-binpac/src/pac_record.cc
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_record.cc 2006-07-26 15:02:40.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_record.cc 2006-07-26 15:02:40.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_record.cc 2007-05-08 16:13:33.373850000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_record.cc 2007-05-08 16:13:33.373850000 -0700
|
||||||
@@ -123,7 +123,7 @@
|
@@ -123,5 +123,5 @@
|
||||||
void RecordType::DoGenParseCode(Output* out_cc, Env* env,
|
void RecordType::DoGenParseCode(Output* out_cc, Env* env,
|
||||||
const DataPtr& data, int flags)
|
const DataPtr& data, int flags)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_paramtype.cc bro-1.2.1-ssl-binpac/src/binpac/pac_paramtype.cc
|
diff -urN bro-1.2.1-orig/src/pac_paramtype.cc bro-1.2.1-ssl-binpac/src/pac_paramtype.cc
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_paramtype.cc 2006-07-26 15:02:40.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_paramtype.cc 2006-07-26 15:02:40.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_paramtype.cc 2007-05-10 15:09:47.470104000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_paramtype.cc 2007-05-10 15:09:47.470104000 -0700
|
||||||
@@ -208,7 +208,13 @@
|
@@ -208,7 +208,13 @@
|
||||||
const char *parse_func;
|
const char *parse_func;
|
||||||
string parse_params;
|
string parse_params;
|
||||||
|
@ -50,9 +50,9 @@ diff -urN bro-1.2.1-orig/src/binpac/pac_paramtype.cc bro-1.2.1-ssl-binpac/src/bi
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_type.cc bro-1.2.1-ssl-binpac/src/binpac/pac_type.cc
|
diff -urN bro-1.2.1-orig/src/pac_type.cc bro-1.2.1-ssl-binpac/src/pac_type.cc
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_type.cc 2006-07-26 15:02:40.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_type.cc 2006-07-26 15:02:40.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_type.cc 2007-05-24 10:56:42.140658000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_type.cc 2007-05-24 10:56:42.140658000 -0700
|
||||||
@@ -501,8 +501,8 @@
|
@@ -501,8 +501,8 @@
|
||||||
|
|
||||||
if ( buffer_mode() == BUFFER_NOTHING )
|
if ( buffer_mode() == BUFFER_NOTHING )
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/lib/binpac_buffer.h bro-1.2.1-ssl-binpac/src/binpac/lib/binpac_buffer.h
|
diff -urN bro-1.2.1-orig/src/lib/binpac_buffer.h bro-1.2.1-ssl-binpac/src/lib/binpac_buffer.h
|
||||||
--- bro-1.2.1-orig/src/binpac/lib/binpac_buffer.h 2006-07-26 15:02:38.000000000 -0700
|
--- bro-1.2.1-orig/src/lib/binpac_buffer.h 2006-07-26 15:02:38.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/lib/binpac_buffer.h 2007-05-09 16:14:54.501656000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/lib/binpac_buffer.h 2007-05-09 16:14:54.501656000 -0700
|
||||||
@@ -59,6 +59,11 @@
|
@@ -59,6 +59,11 @@
|
||||||
return frame_length_;
|
return frame_length_;
|
||||||
}
|
}
|
||||||
|
@ -13,9 +13,9 @@ diff -urN bro-1.2.1-orig/src/binpac/lib/binpac_buffer.h bro-1.2.1-ssl-binpac/src
|
||||||
void NewLine();
|
void NewLine();
|
||||||
// A negative frame_length represents a frame till EOF
|
// A negative frame_length represents a frame till EOF
|
||||||
void NewFrame(int frame_length, bool chunked_);
|
void NewFrame(int frame_length, bool chunked_);
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_flow.cc bro-1.2.1-ssl-binpac/src/binpac/pac_flow.cc
|
diff -urN bro-1.2.1-orig/src/pac_flow.cc bro-1.2.1-ssl-binpac/src/pac_flow.cc
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_flow.cc 2006-10-12 14:13:12.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_flow.cc 2006-10-12 14:13:12.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_flow.cc 2007-05-22 16:43:55.997562000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_flow.cc 2007-05-22 16:43:55.997562000 -0700
|
||||||
@@ -272,7 +272,8 @@
|
@@ -272,7 +272,8 @@
|
||||||
env_->RValue(begin_of_data),
|
env_->RValue(begin_of_data),
|
||||||
env_->RValue(end_of_data));
|
env_->RValue(end_of_data));
|
||||||
|
@ -25,4 +25,3 @@ diff -urN bro-1.2.1-orig/src/binpac/pac_flow.cc bro-1.2.1-ssl-binpac/src/binpac/
|
||||||
+ env_->LValue(flow_buffer_id));
|
+ env_->LValue(flow_buffer_id));
|
||||||
out_cc->inc_indent();
|
out_cc->inc_indent();
|
||||||
out_cc->println("{");
|
out_cc->println("{");
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_type.cc bro-1.2.1-ssl-binpac/src/binpac/pac_type.cc
|
diff -urN bro-1.2.1-orig/src/pac_type.cc bro-1.2.1-ssl-binpac/src/pac_type.cc
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_type.cc 2006-07-26 15:02:40.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_type.cc 2006-07-26 15:02:40.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_type.cc 2007-05-24 10:56:42.140658000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_type.cc 2007-05-24 10:56:42.140658000 -0700
|
||||||
@@ -393,7 +393,7 @@
|
@@ -393,7 +393,7 @@
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_analyzer.cc bro-1.2.1-ssl-binpac/src/binpac/pac_analyzer.cc
|
diff -urN bro-1.2.1-orig/src/pac_analyzer.cc bro-1.2.1-ssl-binpac/src/pac_analyzer.cc
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_analyzer.cc 2006-07-26 15:02:40.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_analyzer.cc 2006-07-26 15:02:40.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_analyzer.cc 2007-05-22 17:00:10.091531000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_analyzer.cc 2007-05-22 17:00:10.091531000 -0700
|
||||||
@@ -26,8 +26,9 @@
|
@@ -26,8 +26,9 @@
|
||||||
helpers_ = new AnalyzerHelperList();
|
helpers_ = new AnalyzerHelperList();
|
||||||
functions_ = new FunctionList();
|
functions_ = new FunctionList();
|
||||||
|
@ -97,9 +97,9 @@ diff -urN bro-1.2.1-orig/src/binpac/pac_analyzer.cc bro-1.2.1-ssl-binpac/src/bin
|
||||||
out = out_cc;
|
out = out_cc;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_analyzer.h bro-1.2.1-ssl-binpac/src/binpac/pac_analyzer.h
|
diff -urN bro-1.2.1-orig/src/pac_analyzer.h bro-1.2.1-ssl-binpac/src/pac_analyzer.h
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_analyzer.h 2006-07-26 15:02:39.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_analyzer.h 2006-07-26 15:02:39.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_analyzer.h 2007-05-22 16:32:08.397926000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_analyzer.h 2007-05-22 16:32:08.397926000 -0700
|
||||||
@@ -76,8 +76,9 @@
|
@@ -76,8 +76,9 @@
|
||||||
AnalyzerHelperList *helpers_;
|
AnalyzerHelperList *helpers_;
|
||||||
FunctionList *functions_;
|
FunctionList *functions_;
|
||||||
|
@ -120,9 +120,9 @@ diff -urN bro-1.2.1-orig/src/binpac/pac_analyzer.h bro-1.2.1-ssl-binpac/src/binp
|
||||||
};
|
};
|
||||||
AnalyzerHelper(Type helper_type, EmbeddedCode *code)
|
AnalyzerHelper(Type helper_type, EmbeddedCode *code)
|
||||||
: AnalyzerElement(HELPER),
|
: AnalyzerElement(HELPER),
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_conn.cc bro-1.2.1-ssl-binpac/src/binpac/pac_conn.cc
|
diff -urN bro-1.2.1-orig/src/pac_conn.cc bro-1.2.1-ssl-binpac/src/pac_conn.cc
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_conn.cc 2006-07-26 15:02:40.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_conn.cc 2006-07-26 15:02:40.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_conn.cc 2007-05-22 16:42:35.406135000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_conn.cc 2007-05-22 16:42:35.406135000 -0700
|
||||||
@@ -97,6 +97,12 @@
|
@@ -97,6 +97,12 @@
|
||||||
out_cc->println("%s->%s();",
|
out_cc->println("%s->%s();",
|
||||||
env_->LValue(downflow_id),
|
env_->LValue(downflow_id),
|
||||||
|
@ -136,9 +136,9 @@ diff -urN bro-1.2.1-orig/src/binpac/pac_conn.cc bro-1.2.1-ssl-binpac/src/binpac/
|
||||||
out_cc->dec_indent();
|
out_cc->dec_indent();
|
||||||
|
|
||||||
out_cc->println("}");
|
out_cc->println("}");
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_flow.cc bro-1.2.1-ssl-binpac/src/binpac/pac_flow.cc
|
diff -urN bro-1.2.1-orig/src/pac_flow.cc bro-1.2.1-ssl-binpac/src/pac_flow.cc
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_flow.cc 2006-10-12 14:13:12.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_flow.cc 2006-10-12 14:13:12.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_flow.cc 2007-05-22 16:43:55.997562000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_flow.cc 2007-05-22 16:43:55.997562000 -0700
|
||||||
@@ -151,6 +151,11 @@
|
@@ -151,6 +151,11 @@
|
||||||
out_cc->inc_indent();
|
out_cc->inc_indent();
|
||||||
out_cc->println("{");
|
out_cc->println("{");
|
||||||
|
@ -151,9 +151,9 @@ diff -urN bro-1.2.1-orig/src/binpac/pac_flow.cc bro-1.2.1-ssl-binpac/src/binpac/
|
||||||
if ( dataunit_->type() == AnalyzerDataUnit::FLOWUNIT )
|
if ( dataunit_->type() == AnalyzerDataUnit::FLOWUNIT )
|
||||||
{
|
{
|
||||||
out_cc->println("%s->set_eof();",
|
out_cc->println("%s->set_eof();",
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_parse.yy bro-1.2.1-ssl-binpac/src/binpac/pac_parse.yy
|
diff -urN bro-1.2.1-orig/src/pac_parse.yy bro-1.2.1-ssl-binpac/src/pac_parse.yy
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_parse.yy 2006-10-12 14:13:12.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_parse.yy 2006-10-12 14:13:12.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_parse.yy 2007-05-22 16:56:09.280526000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_parse.yy 2007-05-22 16:56:09.280526000 -0700
|
||||||
@@ -22,7 +22,7 @@
|
@@ -22,7 +22,7 @@
|
||||||
%token TOK_STATE TOK_ACTION TOK_WHEN TOK_HELPER
|
%token TOK_STATE TOK_ACTION TOK_WHEN TOK_HELPER
|
||||||
%token TOK_DATAUNIT TOK_FLOWDIR TOK_WITHCONTEXT
|
%token TOK_DATAUNIT TOK_FLOWDIR TOK_WITHCONTEXT
|
||||||
|
@ -174,9 +174,9 @@ diff -urN bro-1.2.1-orig/src/binpac/pac_parse.yy bro-1.2.1-ssl-binpac/src/binpac
|
||||||
| TOK_FLOWDIR '=' tok_id optargs ';'
|
| TOK_FLOWDIR '=' tok_id optargs ';'
|
||||||
{
|
{
|
||||||
$$ = new AnalyzerFlow((AnalyzerFlow::Direction) $1, $3, $4);
|
$$ = new AnalyzerFlow((AnalyzerFlow::Direction) $1, $3, $4);
|
||||||
diff -urN bro-1.2.1-orig/src/binpac/pac_scan.ll bro-1.2.1-ssl-binpac/src/binpac/pac_scan.ll
|
diff -urN bro-1.2.1-orig/src/pac_scan.ll bro-1.2.1-ssl-binpac/src/pac_scan.ll
|
||||||
--- bro-1.2.1-orig/src/binpac/pac_scan.ll 2006-07-26 15:02:40.000000000 -0700
|
--- bro-1.2.1-orig/src/pac_scan.ll 2006-07-26 15:02:40.000000000 -0700
|
||||||
+++ bro-1.2.1-ssl-binpac/src/binpac/pac_scan.ll 2007-05-22 16:55:19.349644000 -0700
|
+++ bro-1.2.1-ssl-binpac/src/pac_scan.ll 2007-05-22 16:55:19.349644000 -0700
|
||||||
@@ -96,6 +96,10 @@
|
@@ -96,6 +96,10 @@
|
||||||
BEGIN(EC);
|
BEGIN(EC);
|
||||||
return TOK_LPB_MEMBER;
|
return TOK_LPB_MEMBER;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
Index: pac_type.h
|
Index: src/pac_type.h
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pac_type.h (revision 4130)
|
--- src/pac_type.h (revision 4130)
|
||||||
+++ pac_type.h (working copy)
|
+++ src/pac_type.h (working copy)
|
||||||
@@ -78,12 +78,6 @@
|
@@ -78,12 +78,6 @@
|
||||||
string EvalByteOrder(Output *out_cc, Env *env) const;
|
string EvalByteOrder(Output *out_cc, Env *env) const;
|
||||||
|
|
||||||
|
@ -50,10 +50,10 @@ Index: lib/binpac_buffer.h
|
||||||
if ( buffer_n_ == 0 )
|
if ( buffer_n_ == 0 )
|
||||||
{
|
{
|
||||||
BINPAC_ASSERT(frame_length_ >= 0);
|
BINPAC_ASSERT(frame_length_ >= 0);
|
||||||
Index: pac_type.cc
|
Index: src/pac_type.cc
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pac_type.cc (revision 4130)
|
--- src/pac_type.cc (revision 4130)
|
||||||
+++ pac_type.cc (working copy)
|
+++ src/pac_type.cc (working copy)
|
||||||
@@ -285,9 +285,8 @@
|
@@ -285,9 +285,8 @@
|
||||||
parsing_complete_var, extern_type_bool->Clone());
|
parsing_complete_var, extern_type_bool->Clone());
|
||||||
parsing_complete_var_field_->Prepare(env);
|
parsing_complete_var_field_->Prepare(env);
|
||||||
|
@ -149,10 +149,10 @@ Index: pac_type.cc
|
||||||
bool Type::DoTraverse(DataDepVisitor *visitor)
|
bool Type::DoTraverse(DataDepVisitor *visitor)
|
||||||
{
|
{
|
||||||
foreach (i, FieldList, fields_)
|
foreach (i, FieldList, fields_)
|
||||||
Index: pac_flow.cc
|
Index: src/pac_flow.cc
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pac_flow.cc (revision 4130)
|
--- src/pac_flow.cc (revision 4130)
|
||||||
+++ pac_flow.cc (working copy)
|
+++ src/pac_flow.cc (working copy)
|
||||||
@@ -224,15 +224,13 @@
|
@@ -224,15 +224,13 @@
|
||||||
out_cc->println("catch ( Exception const &e )");
|
out_cc->println("catch ( Exception const &e )");
|
||||||
out_cc->inc_indent();
|
out_cc->inc_indent();
|
||||||
|
@ -169,4 +169,3 @@ Index: pac_flow.cc
|
||||||
+ out_cc->println("throw e;");
|
+ out_cc->println("throw e;");
|
||||||
out_cc->println("}");
|
out_cc->println("}");
|
||||||
out_cc->dec_indent();
|
out_cc->dec_indent();
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue