src: use 'byte' instead of 'upx_byte'; NFCI

src/filter.h

@@ -26,8 +26,6 @@
  */
 
 #pragma once
-#ifndef UPX_FILTER_H__
-#define UPX_FILTER_H__ 1
 
 /*************************************************************************
 // A filter is a reversible operation that modifies a given
@@ -54,10 +52,10 @@ public:
     }
     void init(int id = 0, unsigned addvalue = 0);
 
-    bool filter(SPAN_0(upx_byte) buf, unsigned buf_len);
-    void unfilter(SPAN_0(upx_byte) buf, unsigned buf_len, bool verify_checksum = false);
+    bool filter(SPAN_0(byte) buf, unsigned buf_len);
+    void unfilter(SPAN_0(byte) buf, unsigned buf_len, bool verify_checksum = false);
     void verifyUnfilter();
-    bool scan(SPAN_0(const upx_byte) buf, unsigned buf_len);
+    bool scan(SPAN_0(const byte) buf, unsigned buf_len);
 
     static bool isValidFilter(int filter_id);
     static bool isValidFilter(int filter_id, const int *allowed_filters);
@@ -65,7 +63,7 @@ public:
 public:
     // Will be set by each call to filter()/unfilter().
     // Read-only afterwards.
-    upx_byte *buf = nullptr;
+    byte *buf = nullptr;
     unsigned buf_len = 0;
 
     // Checksum of the buffer before applying the filter
@@ -77,7 +75,7 @@ public:
     const int *preferred_ctos = nullptr;
 
     // Input/output parameters used by various filters
-    unsigned char cto; // call trick offset
+    byte cto; // call trick offset
 
     // Output used by various filters. Read only.
     unsigned calls;
@@ -123,6 +121,4 @@ private:
     static const int n_filters; // number of filters[]
 };
 
-#endif /* already included */
-
 /* vim:set ts=4 sw=4 et: */