From 18926e25c45e7621e2c9db2f2da37efe06257d96 Mon Sep 17 00:00:00 2001 From: Timo Korvola Date: Fri, 2 Mar 2018 22:19:11 +0200 Subject: [PATCH] Lose remaining traces of rindex. rindex never was but POSIX and is deprecated even there. strrchr does the same and is C89. --- src/curses/ux_blorb.c | 4 ++-- src/curses/ux_frotz.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/curses/ux_blorb.c b/src/curses/ux_blorb.c index 0db0f02..db7ec07 100644 --- a/src/curses/ux_blorb.c +++ b/src/curses/ux_blorb.c @@ -89,7 +89,7 @@ bb_err_t ux_blorb_init(char *filename) mystring = malloc(len2 * sizeof(char) + 1); strncpy(mystring, filename, len1 * sizeof(char)); - p = rindex(mystring, '.'); + p = strrchr(mystring, '.'); if (p != NULL) *p = '\0'; @@ -97,7 +97,7 @@ bb_err_t ux_blorb_init(char *filename) /* Check if foo.blb is there. */ if ((fp = fopen(mystring, "rb")) == NULL) { - p = rindex(mystring, '.'); + p = strrchr(mystring, '.'); if (p != NULL) *p = '\0'; strncat(mystring, EXT_BLORB3, len2 * sizeof(char)); diff --git a/src/curses/ux_frotz.h b/src/curses/ux_frotz.h index 6126981..091e362 100644 --- a/src/curses/ux_frotz.h +++ b/src/curses/ux_frotz.h @@ -13,10 +13,6 @@ #include "../blorb/blorblow.h" #include "ux_setup.h" -#ifndef rindex - #define rindex strrchr -#endif - #define MASTER_CONFIG "frotz.conf" #define USER_CONFIG ".frotzrc" #define ASCII_DEF 1 -- 2.34.1