From dfc8a0d54872ac37d7edc5ed121f729000755750 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Sat, 6 Jan 2001 14:54:45 +0000
Subject: [PATCH] Renamed ctjo to ctoj, and ctjor to ctojr.

committer: mfx <mfx> 978792885 +0000
---
 src/filter/{ctjo.h => ctoj.h}   |  2 +-
 src/filter/{ctjor.h => ctojr.h} |  2 +-
 src/filteri.cpp                 | 24 ++++++++++++------------
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename src/filter/{ctjo.h => ctoj.h} (99%)
 rename src/filter/{ctjor.h => ctojr.h} (99%)

diff --git a/src/filter/ctjo.h b/src/filter/ctoj.h
similarity index 99%
rename from src/filter/ctjo.h
rename to src/filter/ctoj.h
index 41081eca..40fa6222 100644
--- a/src/filter/ctjo.h
+++ b/src/filter/ctoj.h
@@ -1,4 +1,4 @@
-/* ctjo.h -- filter CTO implementation
+/* ctoj.h -- filter CTO implementation
 
    This file is part of the UPX executable compressor.
 
diff --git a/src/filter/ctjor.h b/src/filter/ctojr.h
similarity index 99%
rename from src/filter/ctjor.h
rename to src/filter/ctojr.h
index 1213bb23..60286f5c 100644
--- a/src/filter/ctjor.h
+++ b/src/filter/ctojr.h
@@ -1,4 +1,4 @@
-/* ctjor.h -- filter CTO implementation; renumber destinations MRU
+/* ctojr.h -- filter CTO implementation; renumber destinations MRU
 
    This file is part of the UPX executable compressor.
 
diff --git a/src/filteri.cpp b/src/filteri.cpp
index 74e94fbd..18440eda 100644
--- a/src/filteri.cpp
+++ b/src/filteri.cpp
@@ -81,11 +81,11 @@
 #define COND(b,x,lastcall) \
         (b[x] == 0xe8 || b[x] == 0xe9 \
          || (lastcall!=(x) && 0xf==b[(x)-1] && 0x80<=b[x] && b[x]<=0x8f) )
-#define F                       f_ctjo32_e8e9_bswap_le
-#define U                       u_ctjo32_e8e9_bswap_le
-#include "filter/ctjo.h"
-#define F                       s_ctjo32_e8e9_bswap_le
-#include "filter/ctjo.h"
+#define F                       f_ctoj32_e8e9_bswap_le
+#define U                       u_ctoj32_e8e9_bswap_le
+#include "filter/ctoj.h"
+#define F                       s_ctoj32_e8e9_bswap_le
+#include "filter/ctoj.h"
 #undef COND
 
 
@@ -100,11 +100,11 @@
 #define CONDF(b,x,lastcall) (COND1(b,x) || COND2(b,lastcall,x,(x)-1, x   ))
 #define CONDU(b,x,lastcall) (COND1(b,x) || COND2(b,lastcall,x, x   ,(x)-1))
 
-#define F                       f_ctjor32_e8e9_bswap_le
-#define U                       u_ctjor32_e8e9_bswap_le
-#include "filter/ctjor.h"
-#define F                       s_ctjor32_e8e9_bswap_le
-#include "filter/ctjor.h"
+#define F                       f_ctojr32_e8e9_bswap_le
+#define U                       u_ctojr32_e8e9_bswap_le
+#include "filter/ctojr.h"
+#define F                       s_ctojr32_e8e9_bswap_le
+#include "filter/ctojr.h"
 #undef CONDU
 #undef CONDF
 #undef COND2
@@ -157,10 +157,10 @@ const FilterImp::FilterEntry FilterImp::filters[] = {
     { 0x25, 6, 0x00ffffff, f_cto32_e9_bswap_le, u_cto32_e9_bswap_le, s_cto32_e9_bswap_le },
     { 0x26, 6, 0x00ffffff, f_cto32_e8e9_bswap_le, u_cto32_e8e9_bswap_le, s_cto32_e8e9_bswap_le },
     // 32-bit cto calltrick + jmp
-    { 0x36, 6, 0x00ffffff, f_ctjo32_e8e9_bswap_le, u_ctjo32_e8e9_bswap_le, s_ctjo32_e8e9_bswap_le },
+    { 0x36, 6, 0x00ffffff, f_ctoj32_e8e9_bswap_le, u_ctoj32_e8e9_bswap_le, s_ctoj32_e8e9_bswap_le },
 
     // 32-bit ctor calltrick with relative renumbering + jmp
-    { 0x80, 8, 0x00ffffff, f_ctjor32_e8e9_bswap_le, u_ctjor32_e8e9_bswap_le, s_ctjor32_e8e9_bswap_le },
+    { 0x80, 8, 0x00ffffff, f_ctojr32_e8e9_bswap_le, u_ctojr32_e8e9_bswap_le, s_ctojr32_e8e9_bswap_le },
 };
 
 const int FilterImp::n_filters = HIGH(filters);