The following commit has been merged in the master branch:
commit 599556110254f956204a2baa01ae3b7675507c59
Author: Miriam Ruiz <[email protected]>
Date: Wed Apr 29 03:20:29 2009 +0200
Removed unneeded inizialization test values
diff --git a/filter.cfg b/filter.cfg
index c313fdc..ff9fba1 100644
--- a/filter.cfg
+++ b/filter.cfg
@@ -15,4 +15,4 @@
<filter target="green" id="G 1">
<rule condition="violence::none & sex::none &
!issues::bad-words & ! issues::discrimination " />
</filter>
-</gofind>
\ No newline at end of file
+</gofind>
diff --git a/filter.cpp b/filter.cpp
index 11decd0..00ca54f 100644
--- a/filter.cpp
+++ b/filter.cpp
@@ -41,123 +41,8 @@
#define GREEN_MINIMUM 2
-PackageFilter::PackageFilter()
+PackageFilter::PackageFilter() : list(NULL)
{
- list = NULL;
- ResultList *element = NULL;
-
- // BLACK
-
- element = new ResultList("black 1", PackageFilter::Black);
- tagdata.SetTag(&element->positive, "rating:sex::violence");
- AddLast(element);
-
- // RED
-
- element = new ResultList("red 1", PackageFilter::Red);
- tagdata.SetTag(&element->positive,
"rating:violence::non-realistic:optional");
- AddLast(element);
-
- element = new ResultList("red 2", PackageFilter::Red);
- tagdata.SetTag(&element->positive, "rating:violence::non-realistic");
- AddLast(element);
-
- element = new ResultList("red 3", PackageFilter::Red);
- tagdata.SetTag(&element->positive,
"rating:violence::realistic:optional");
- AddLast(element);
-
- element = new ResultList("red 4", PackageFilter::Red);
- tagdata.SetTag(&element->positive, "rating:violence::realistic");
- AddLast(element);
-
- element = new ResultList("red 5", PackageFilter::Red);
- tagdata.SetTag(&element->positive, "rating:sex::non-realistic");
- AddLast(element);
-
- element = new ResultList("red 6", PackageFilter::Red);
- tagdata.SetTag(&element->positive, "rating:sex::realistic:optional");
- AddLast(element);
-
- element = new ResultList("red 7", PackageFilter::Red);
- tagdata.SetTag(&element->positive, "rating:sex::realistic");
- AddLast(element);
-
- element = new ResultList("red 8", PackageFilter::Red);
- tagdata.SetTag(&element->positive, "rating:sex::hard:optional");
- AddLast(element);
-
- element = new ResultList("red 9", PackageFilter::Red);
- tagdata.SetTag(&element->positive, "rating:sex::hard");
- AddLast(element);
-
- element = new ResultList("red A", PackageFilter::Red);
- tagdata.SetTag(&element->positive, "rating:sex::violence:optional");
- AddLast(element);
-
- element = new ResultList("red B", PackageFilter::Red);
- tagdata.SetTag(&element->positive, "rating:theme::cruelty");
- AddLast(element);
-
- // YELLOW
-
- element = new ResultList("yellow 1", PackageFilter::Yellow);
- tagdata.SetTag(&element->positive, "rating:violence::minor");
- AddLast(element);
-
- element = new ResultList("yellow 2", PackageFilter::Yellow);
- tagdata.SetTag(&element->positive, "rating:violence::brief");
- AddLast(element);
-
- element = new ResultList("yellow 3", PackageFilter::Yellow);
- tagdata.SetTag(&element->positive, "rating:sex::nudity");
- AddLast(element);
-
- element = new ResultList("yellow 4", PackageFilter::Yellow);
- tagdata.SetTag(&element->positive,
"rating:sex::non-realistic:optional");
- AddLast(element);
-
- element = new ResultList("yellow 5", PackageFilter::Yellow);
- tagdata.SetTag(&element->positive, "rating:theme::death");
- AddLast(element);
-
- element = new ResultList("yellow 6", PackageFilter::Yellow);
- tagdata.SetTag(&element->positive, "rating:theme::horror");
- AddLast(element);
-
- // GREEN
-
- element = new ResultList("green 1", PackageFilter::Green);
- tagdata.SetTag(&element->positive, "rating:violence::none");
- tagdata.SetTag(&element->positive, "rating:sex::none");
- tagdata.SetTag(&element->positive, "rating:language::benign");
- tagdata.SetTag(&element->positive, "rating:discrimination::none");
- AddLast(element);
-
- element = new ResultList("green 2", PackageFilter::Green);
- tagdata.SetTag(&element->positive, "rating:violence::minor:optional");
- tagdata.SetTag(&element->positive, "rating:sex::none");
- tagdata.SetTag(&element->positive, "rating:language::benign");
- tagdata.SetTag(&element->positive, "rating:discrimination::none");
- AddLast(element);
-
- element = new ResultList("green 3", PackageFilter::Green);
- tagdata.SetTag(&element->positive, "rating:violence::none");
- tagdata.SetTag(&element->positive, "rating:sex::nudity:optional");
- tagdata.SetTag(&element->positive, "rating:language::benign");
- tagdata.SetTag(&element->positive, "rating:discrimination::none");
- AddLast(element);
-
- element = new ResultList("green 4", PackageFilter::Green);
- tagdata.SetTag(&element->positive, "rating:violence::minor:optional");
- tagdata.SetTag(&element->positive, "rating:sex::nudity:optional");
- tagdata.SetTag(&element->positive, "rating:language::benign");
- tagdata.SetTag(&element->positive, "rating:discrimination::none");
- AddLast(element);
-
- AddLast("green 4", PackageFilter::Green, "a&(b|c|d)&d");
-
- Print(std::cerr);
- std::cerr << std::endl;
}
PackageFilter::~PackageFilter()
@@ -182,9 +67,9 @@ bool PackageFilter::Load(const char *filename)
fseek( fd, 0, SEEK_SET);
char *buffer = new char[fsize + 1];
+ memset(buffer, 0, fsize + 1);
fread(buffer, fsize, 1, fd);
fclose(fd);
- buffer[fsize + 1] = '\0';
rapidxml::xml_document<> doc;
try {
@@ -227,7 +112,7 @@ bool PackageFilter::Load(const char *filename)
PackageFilter::Unknown,
condition->value()
))
- std::cerr << "Error Adding '"<<
condition->value() << "'" << endl;
+ std::cerr << "Error Adding '"<<
condition->value() << "'" << std::endl;
}
}
--
Development fot GoFind!
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
