Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 18:33:27 +01:00
Code Issues Projects Releases Wiki Activity

bump version to 0.4.1

Browse Source
This commit is contained in:
Jfreegman 2014-06-18 15:54:50 -04:00
parent 58a131426a
commit 7eb82a0fe5
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.65]) AC_PREREQ([2.65])
AC_INIT([toxic], [0.4.0], [https://tox.im/]) AC_INIT([toxic], [0.4.1], [https://tox.im/])
AC_CONFIG_AUX_DIR(configure_aux) AC_CONFIG_AUX_DIR(configure_aux)
AC_CONFIG_SRCDIR([src/toxic.c]) AC_CONFIG_SRCDIR([src/toxic.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])

6
src/toxic.c
View File

@ -111,14 +111,14 @@ void exit_toxic_success(Tox *m)
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
void exit_toxic_err(const char *errmsg, int retcode) void exit_toxic_err(const char *errmsg, int errcode)
{ {
if (errmsg == NULL) if (errmsg == NULL)
errmsg = "No error message"; errmsg = "No error message";
endwin(); endwin();
fprintf(stderr, "Toxic session aborted with return code %d (%s)\n", retcode, errmsg); fprintf(stderr, "Toxic session aborted with error code %d (%s)\n", errcode, errmsg);
exit(retcode); exit(EXIT_FAILURE);
} }
static void init_term(void) static void init_term(void)

14
src/toxic.h
View File

@ -41,8 +41,6 @@
#define KEY_IDENT_DIGITS 2 /* number of hex digits to display for the pub-key based identifier */ #define KEY_IDENT_DIGITS 2 /* number of hex digits to display for the pub-key based identifier */
#define TIME_STR_SIZE 16 #define TIME_STR_SIZE 16
#define EXIT_SUCCESS 0
/* ASCII key codes */ /* ASCII key codes */
#define T_KEY_KILL 0x0B /* ctrl-k */ #define T_KEY_KILL 0x0B /* ctrl-k */
#define T_KEY_DISCARD 0x15 /* ctrl-u */ #define T_KEY_DISCARD 0x15 /* ctrl-u */
@ -60,15 +58,15 @@ enum {
} KEY_DIRS; } KEY_DIRS;
typedef enum _FATAL_ERRS { typedef enum _FATAL_ERRS {
FATALERR_MEMORY = -1, FATALERR_MEMORY = -1, /* malloc() or calloc() failed */
FATALERR_FREAD = -2, FATALERR_FREAD = -2, /* fread() failed on critical read */
FATALERR_THREAD_CREATE = -3, FATALERR_THREAD_CREATE = -3,
FATALERR_MUTEX_INIT = -4, FATALERR_MUTEX_INIT = -4,
FATALERR_LOCALE_SET = -5, FATALERR_LOCALE_SET = -5,
FATALERR_STORE_DATA = -6, FATALERR_STORE_DATA = -6,
FATALERR_NETWORKINIT = -7, FATALERR_NETWORKINIT = -7, /* Tox network failed to init */
FATALERR_INFLOOP = -8, FATALERR_INFLOOP = -8, /* infinite loop detected */
FATALERR_WININIT = -9, FATALERR_WININIT = -9, /* window init failed */
} FATAL_ERRS; } FATAL_ERRS;
/* Fixes text color problem on some terminals. /* Fixes text color problem on some terminals.
@ -76,7 +74,7 @@ typedef enum _FATAL_ERRS {
/* #define URXVT_FIX */ /* #define URXVT_FIX */
void exit_toxic_success(Tox *m); void exit_toxic_success(Tox *m);
void exit_toxic_err(const char *errmsg, int retcode); void exit_toxic_err(const char *errmsg, int errcode);
void on_request(Tox *m, const uint8_t *public_key, const uint8_t *data, uint16_t length, void *userdata); void on_request(Tox *m, const uint8_t *public_key, const uint8_t *data, uint16_t length, void *userdata);
void on_connectionchange(Tox *m, int32_t friendnumber, uint8_t status, void *userdata); void on_connectionchange(Tox *m, int32_t friendnumber, uint8_t status, void *userdata);