1 files changed, 10 insertions, 10 deletions

diff --git a/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp b/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp
index 5cf7528ff1c..ffcb4ca4019 100644
--- a/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp
+++ b/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp
@@ -8,14 +8,14 @@
 #include <fstream>
 
 #include <vespa/fastlib/io/bufferedfile.h>
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 #include <unistd.h>
 
 namespace search {
 
 typedef AttributeVector::SP AttributePtr;
 
-class LoadAttribute : public FastOS_Application
+class LoadAttribute
 {
 private:
     void load(const AttributePtr & ptr);
@@ -24,7 +24,7 @@ private:
     void usage();
 
 public:
-    int Main() override;
+    int main(int argc, char **argv);
 };
 
 void
@@ -105,7 +105,7 @@ LoadAttribute::usage()
 }
 
 int
-LoadAttribute::Main()
+LoadAttribute::main(int argc, char **argv)
 {
     bool doPrintContent = false;
     bool doApplyUpdate = false;
@@ -115,7 +115,7 @@ LoadAttribute::Main()
 
     int opt;
     bool optError = false;
-    while ((opt = getopt(_argc, _argv, "pasf:h")) != -1) {
+    while ((opt = getopt(argc, argv, "pasf:h")) != -1) {
         switch (opt) {
         case 'p':
             doPrintContent = true;
@@ -144,12 +144,12 @@ LoadAttribute::Main()
         }
     }
 
-    if (_argc != (optind + 1) || optError) {
+    if (argc != (optind + 1) || optError) {
         usage();
         return -1;
     }
 
-    vespalib::string fileName(_argv[optind]);
+    vespalib::string fileName(argv[optind]);
     vespalib::FileHeader fh;
     {
         vespalib::string datFileName(fileName + ".dat");
@@ -199,8 +199,8 @@ LoadAttribute::Main()
 
 }
 
-int main(int argc, char ** argv)
-{
+int main(int argc, char ** argv) {
+    vespalib::SignalHandler::PIPE.ignore();
     search::LoadAttribute myApp;
-    return myApp.Entry(argc, argv);
+    return myApp.main(argc, argv);
 }