Converting typedef aliases to using aliases (#9589)

using aliases are pretty universally preferred over typedefs. Modern
editors complain about them which is distracting. This is a pass through
all typedefs, changing the non-c uses of them to using aliases.

Author: bneradt

example/plugins/cpp-api/websocket/WSBuffer.h

@@ -34,7 +34,7 @@ enum ws_frametype {
   WS_FRAME_PING         = 0x9,
   WS_FRAME_PONG         = 0xA
 };
-typedef enum ws_frametype WS_FRAMETYPE;
+using WS_FRAMETYPE = enum ws_frametype;
 
 #define WS_RSV1      0x40
 #define WS_RSV2      0x20

include/records/I_RecCore.h

@@ -40,7 +40,7 @@ int RecSetDiags(Diags *diags);
 //-------------------------------------------------------------------------
 // Config File Parsing
 //-------------------------------------------------------------------------
-typedef void (*RecConfigEntryCallback)(RecT rec_type, RecDataT data_type, const char *name, const char *value, RecSourceT source);
+using RecConfigEntryCallback = void (*)(RecT, RecDataT, const char *, const char *, RecSourceT);
 
 void RecConfigFileInit();
 int RecConfigFileParse(const char *path, RecConfigEntryCallback handler);
@@ -154,7 +154,7 @@ RecErrT RecGetRecordBool(const char *name, RecBool *rec_byte, bool lock = true);
 //------------------------------------------------------------------------
 // Record Attributes Reading
 //------------------------------------------------------------------------
-typedef void (*RecLookupCallback)(const RecRecord *, void *);
+using RecLookupCallback = void (*)(const RecRecord *, void *);
 
 RecErrT RecLookupRecord(const char *name, RecLookupCallback callback, void *data, bool lock = true);
 RecErrT RecLookupMatchingRecords(unsigned rec_type, const char *match, RecLookupCallback callback, void *data, bool lock = true);

include/records/I_RecDefs.h

@@ -40,13 +40,13 @@ enum RecErrT {
 //-------------------------------------------------------------------------
 #define RecStringNull nullptr
 
-typedef int64_t RecInt;
-typedef float RecFloat;
-typedef char *RecString;
-typedef const char *RecStringConst;
-typedef int64_t RecCounter;
-typedef int8_t RecByte;
-typedef bool RecBool;
+using RecInt         = int64_t;
+using RecFloat       = float;
+using RecString      = char *;
+using RecStringConst = const char *;
+using RecCounter     = int64_t;
+using RecByte        = int8_t;
+using RecBool        = bool;
 
 enum RecT {
   RECT_NULL    = 0x00,
@@ -178,6 +178,6 @@ struct RecRawStatBlock {
 //-------------------------------------------------------------------------
 // RecCore Callback Types
 //-------------------------------------------------------------------------
-typedef int (*RecConfigUpdateCb)(const char *name, RecDataT data_type, RecData data, void *cookie);
-typedef int (*RecStatUpdateFunc)(const char *name, RecDataT data_type, RecData *data, RecRawStatBlock *rsb, int id, void *cookie);
-typedef int (*RecRawStatSyncCb)(const char *name, RecDataT data_type, RecData *data, RecRawStatBlock *rsb, int id);
+using RecConfigUpdateCb = int (*)(const char *, RecDataT, RecData, void *);
+using RecStatUpdateFunc = int (*)(const char *, RecDataT, RecData *, RecRawStatBlock *, int, void *);
+using RecRawStatSyncCb  = int (*)(const char *, RecDataT, RecData *, RecRawStatBlock *, int);

include/records/I_RecHttp.h

@@ -243,10 +243,10 @@ extern SessionProtocolNameRegistry globalSessionProtocolNameRegistry;
  */
 struct HttpProxyPort {
 private:
-  typedef HttpProxyPort self; ///< Self reference type.
+  using self = HttpProxyPort; ///< Self reference type.
 public:
   /// Explicitly supported collection of proxy ports.
-  typedef std::vector<self> Group;
+  using Group = std::vector<self>;
 
   /// Type of transport on the connection.
   enum TransportType {

include/records/I_RecordsConfig.h

@@ -46,7 +46,7 @@ struct RecordElement {
   RecAccessT access; // access level of the record
 };
 
-typedef void (*RecordElementCallback)(const RecordElement *, void *);
+using RecordElementCallback = void (*)(const RecordElement *, void *);
 void RecordsConfigIterate(RecordElementCallback, void *);
 
 void LibRecordsConfigInit(); // initializes RecordsConfigIndex

include/records/P_RecDefs.h

@@ -58,19 +58,19 @@ enum RecEntryT {
   RECE_RECORD,
 };
 
-typedef struct RecConfigCbList_t {
+using RecConfigUpdateCbList = struct RecConfigCbList_t {
   RecConfigUpdateCb update_cb;
   void *update_cookie;
   struct RecConfigCbList_t *next;
-} RecConfigUpdateCbList;
+};
 
-typedef struct RecStatUpdateFuncList_t {
+using RecStatUpdateFuncList = struct RecStatUpdateFuncList_t {
   RecRawStatBlock *rsb;
   int id;
   RecStatUpdateFunc update_func;
   void *update_cookie;
   struct RecStatUpdateFuncList_t *next;
-} RecStatUpdateFuncList;
+};
 
 struct RecStatMeta {
   RecRawStat data_raw;
@@ -142,8 +142,8 @@ struct RecMessageItr {
   int next;
 };
 
-typedef RecMessageHdr RecMessage;
+using RecMessage = RecMessageHdr;
 
-typedef void (*RecDumpEntryCb)(RecT rec_type, void *edata, int registered, const char *name, int data_type, RecData *datum);
+using RecDumpEntryCb = void (*)(RecT, void *, int, const char *, int, RecData *);
 
-typedef RecErrT (*RecMessageRecvCb)(RecMessage *msg, RecMessageT msg_type, void *cookie);
+using RecMessageRecvCb = RecErrT (*)(RecMessage *, RecMessageT, void *);

include/records/P_RecFile.h

@@ -28,7 +28,7 @@
 //-------------------------------------------------------------------------
 
 #define REC_HANDLE_INVALID -1
-typedef int RecHandle;
+using RecHandle = int;
 
 static constexpr unsigned VERSION_HDR_SIZE = 5;
 //-------------------------------------------------------------------------

include/tscore/ConsistentHash.h

@@ -38,7 +38,7 @@ struct ATSConsistentHashNode {
 
 std::ostream &operator<<(std::ostream &os, ATSConsistentHashNode &thing);
 
-typedef std::map<uint64_t, ATSConsistentHashNode *>::iterator ATSConsistentHashIter;
+using ATSConsistentHashIter = std::map<uint64_t, ATSConsistentHashNode *>::iterator;
 
 /*
   TSConsistentHash requires a TSHash64 object

include/tscore/DiagsTypes.h

@@ -73,7 +73,7 @@ enum DiagsShowLocation { SHOW_LOCATION_NONE = 0, SHOW_LOCATION_DEBUG, SHOW_LOCAT
 
 // Cleanup Function Prototype - Called before ink_fatal to
 //   cleanup process state
-typedef void (*DiagsCleanupFunc)();
+using DiagsCleanupFunc = void (*)();
 
 class DiagsConfigState
 {

include/tscore/Errata.h

@@ -85,32 +85,32 @@ class Errata
   /// Implementation class.
   struct Data;
   /// Handle for implementation class instance.
-  typedef IntrusivePtr<Data> ImpPtr;
+  using ImpPtr = IntrusivePtr<Data>;
 
 public:
-  typedef Errata self; /// Self reference type.
+  using self = Errata; /// Self reference type.
 
   /// Message ID.
-  typedef NumericType<unsigned int, struct MsgIdTag> Id;
+  using Id = NumericType<unsigned int, struct MsgIdTag>;
 
   /* Tag / level / code severity.
      This is intended for clients to use to provide additional
      classification of a message. A severity code, as for syslog,
      is a common use.
 
   */
-  typedef NumericType<unsigned int, struct CodeTag> Code;
+  using Code = NumericType<unsigned int, struct CodeTag>;
   struct Message;
 
-  typedef std::deque<Message> Container; ///< Storage type for messages.
+  using Container = std::deque<Message>; ///< Storage type for messages.
   // We iterate backwards to look like a stack.
-  //    typedef Container::reverse_iterator iterator; ///< Message iteration.
+  //    using iterator = Container::reverse_iterator; ///< Message iteration.
   /// Message const iteration.
-  //    typedef Container::const_reverse_iterator const_iterator;
+  //    using const_iterator = Container::const_reverse_iterator;
   /// Reverse message iteration.
-  //    typedef Container::iterator reverse_iterator;
+  //    using reverse_iterator = Container::iterator;
   /// Reverse constant message iteration.
-  //    typedef Container::const_iterator const_reverse_iterator;
+  //    using const_reverse_iterator = Container::const_iterator;
 
   /// Default constructor - empty errata, very fast.
   Errata();
@@ -288,8 +288,8 @@ class Errata
   class Sink : public IntrusivePtrCounter
   {
   public:
-    typedef Sink self;                 ///< Self reference type.
-    typedef IntrusivePtr<self> Handle; ///< Handle type.
+    using self   = Sink;               ///< Self reference type.
+    using Handle = IntrusivePtr<self>; ///< Handle type.
 
     /// Handle an abandoned errata.
     virtual void operator()(Errata const &) const = 0;
@@ -301,7 +301,7 @@ class Errata
   static void registerSink(Sink::Handle const &s);
 
   /// Register a function as a sink.
-  typedef void (*SinkHandlerFunction)(Errata const &);
+  using SinkHandlerFunction = void (*)(Errata const &);
 
   // Wrapper class to support registering functions as sinks.
   struct SinkFunctionWrapper : public Sink {
@@ -374,7 +374,7 @@ extern std::ostream &operator<<(std::ostream &os, Errata const &stat);
 
 /// Storage for a single message.
 struct Errata::Message {
-  typedef Message self; ///< Self reference type.
+  using self = Message; ///< Self reference type.
 
   /// Default constructor.
   /// The message has Id = 0, default code,  and empty text.
@@ -447,7 +447,7 @@ struct Errata::Message {
   static Code Default_Code;
 
   /// Type for overriding success message test.
-  typedef bool (*SuccessTest)(Message const &m);
+  using SuccessTest = bool (*)(Message const &m);
 
   /** Success message test.
 
@@ -488,7 +488,7 @@ struct Errata::Message {
     mainly because the client can't see this class so we can't
 */
 struct Errata::Data : public IntrusivePtrCounter {
-  typedef Data self; ///< Self reference type.
+  using self = Data; ///< Self reference type.
 
   //! Default constructor.
   Data();
@@ -517,8 +517,8 @@ struct Errata::Data : public IntrusivePtrCounter {
 class Errata::iterator : public Errata::Container::reverse_iterator
 {
 public:
-  typedef iterator self;                             ///< Self reference type.
-  typedef Errata::Container::reverse_iterator super; ///< Parent type.
+  using self  = iterator;                            ///< Self reference type.
+  using super = Errata::Container::reverse_iterator; ///< Parent type.
   iterator();                                        ///< Default constructor.
   /// Copy constructor.
   iterator(self const &that ///< Source instance.
@@ -540,8 +540,8 @@ class Errata::iterator : public Errata::Container::reverse_iterator
 class Errata::const_iterator : public Errata::Container::const_reverse_iterator
 {
 public:
-  typedef const_iterator self;                             ///< Self reference type.
-  typedef Errata::Container::const_reverse_iterator super; ///< Parent type.
+  using self  = const_iterator;                            ///< Self reference type.
+  using super = Errata::Container::const_reverse_iterator; ///< Parent type.
   const_iterator();                                        ///< Default constructor.
   /// Copy constructor.
   const_iterator(self const &that ///< Source instance.
@@ -601,9 +601,9 @@ struct RvBase {
     asynchronously.
  */
 template <typename R> struct Rv : public RvBase {
-  typedef Rv self;      ///< Standard self reference type.
-  typedef RvBase super; ///< Standard super class reference type.
-  typedef R Result;     ///< Type of result value.
+  using self   = Rv;     ///< Standard self reference type.
+  using super  = RvBase; ///< Standard super class reference type.
+  using Result = R;      ///< Type of result value.
 
   Result _result; ///< The actual result of the function.