minor cosmetic changes/renames
[rxpd] / rxpd.h
diff --git a/rxpd.h b/rxpd.h
index e60e8e0..ed45055 100644 (file)
--- a/rxpd.h
+++ b/rxpd.h
   RXPD_CMD(LOAD)                                \
   RXPD_CMD(SAVE)                                \
   RXPD_CMD(DUMP)                                \
-  RXPD_CMD(LIST)                                \
-  RXPD_CMD(END)                                 \
+  RXPD_CMD(LIST)
 
 #define RXPD_CMD(cmd) RXPD_CMD_##cmd,
-enum {RXPD_COMMANDS};
+enum rxpd_cmd_e {RXPD_COMMANDS};
 #undef RXPD_CMD
 
 struct rxpd_base;
@@ -211,10 +210,10 @@ int
 rxpd_connection_readline (struct rxpd_connection* self);
 
 void
-rxpd_connection_parse_cmd (int sock, short event, void* ptr);
+rxpd_connection_parse_cmd (int fd, short event, void* ptr);
 
 /* generate prototypes for each defined command */
-#define RXPD_CMD(cmd) void rxpd_connection_cmd_##cmd (int sock, short event, void* ptr);
+#define RXPD_CMD(cmd) void rxpd_connection_cmd_##cmd (int fd, short event, void* ptr);
 RXPD_COMMANDS
 #undef RXPD_CMD