about summary refs log tree commit diff homepage
path: root/merge.c
diff options
context:
space:
mode:
authorJune McEnroe <programble@gmail.com>2018-03-05 12:54:26 -0500
committerJune McEnroe <programble@gmail.com>2018-03-05 12:54:26 -0500
commit737c28c63c525fcc033bd9f0adb36e2c65d9f6a8 (patch)
tree13fd6a4318eb9fa8a6d77955e29ad6d5178aa1a6 /merge.c
parentPack message type enums (diff)
downloadtorus-737c28c63c525fcc033bd9f0adb36e2c65d9f6a8.tar.gz
torus-737c28c63c525fcc033bd9f0adb36e2c65d9f6a8.zip
Rename Tile timestamps {create,modify,access}Time
Diffstat (limited to '')
-rw-r--r--merge.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/merge.c b/merge.c
index 2333e9d..bf1a1b5 100644
--- a/merge.c
+++ b/merge.c
@@ -87,9 +87,11 @@ int main(int argc, char *argv[]) {
         if (!lenA && !lenB) break;
         if (!lenA || !lenB) errx(EX_IOERR, "different size inputs");
 
-        const struct Tile *tileC = (tileA.access > tileB.access) ? &tileA : &tileB;
+        const struct Tile *tileC = (tileA.accessTime > tileB.accessTime)
+            ? &tileA
+            : &tileB;
 
-        if (tileA.modify != tileB.modify) {
+        if (tileA.modifyTime != tileB.modifyTime) {
             drawTile(0, &tileA);
             drawTile(CELL_ROWS + 1, &tileB);
             move(CELL_ROWS * 2 + 2, 0);