1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 22:13:26 +01:00

general cleanup: rm unused config.h, add license info to device.c/h, add a couple compiler options and fix warnings

This commit is contained in:
Jfreegman 2014-06-24 17:45:14 -04:00
parent 6490fa598c
commit ef097757f3
20 changed files with 53 additions and 76 deletions

View File

@ -20,10 +20,6 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "toxic.h" #include "toxic.h"
#include "windows.h" #include "windows.h"
#include "audio_call.h" #include "audio_call.h"
@ -258,6 +254,8 @@ int start_transmission(ToxWindow *self)
0 != pthread_detach(ASettins.calls[self->call_idx].ttid) ) { 0 != pthread_detach(ASettins.calls[self->call_idx].ttid) ) {
return -1; return -1;
} }
return 0;
} }
int stop_transmission(int call_index) int stop_transmission(int call_index)
@ -265,7 +263,10 @@ int stop_transmission(int call_index)
if ( ASettins.calls[call_index].ttas ) { if ( ASettins.calls[call_index].ttas ) {
toxav_kill_transmission(ASettins.av, call_index); toxav_kill_transmission(ASettins.av, call_index);
ASettins.calls[call_index].ttas = _False; ASettins.calls[call_index].ttas = _False;
return 0;
} }
return -1;
} }
/* /*
* End of transmission * End of transmission

View File

@ -24,10 +24,6 @@
#define _GNU_SOURCE /* needed for strcasestr() and wcwidth() */ #define _GNU_SOURCE /* needed for strcasestr() and wcwidth() */
#endif #endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>

View File

@ -20,10 +20,6 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@ -20,10 +20,6 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>

View File

@ -1,7 +1,28 @@
/* device.c
*
*
* Copyright (C) 2014 Toxic All Rights Reserved.
*
* This file is part of Toxic.
*
* Toxic is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Toxic is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Toxic. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include "audio_call.h" #include "audio_call.h"
#include "line_info.h" #include "line_info.h"
#ifdef __APPLE__ #ifdef __APPLE__
#include <OpenAL/al.h> #include <OpenAL/al.h>
#include <OpenAL/alc.h> #include <OpenAL/alc.h>

View File

@ -1,5 +1,23 @@
/* /* device.h
* Toxic -- Tox Curses Client *
*
* Copyright (C) 2014 Toxic All Rights Reserved.
*
* This file is part of Toxic.
*
* Toxic is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Toxic is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Toxic. If not, see <http://www.gnu.org/licenses/>.
*
*/ */
/* /*
@ -8,7 +26,6 @@
* Read from running input device(s) via select()/callback combo. * Read from running input device(s) via select()/callback combo.
*/ */
#ifndef _device_h #ifndef _device_h
#define _device_h #define _device_h

View File

@ -20,10 +20,6 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -284,6 +280,7 @@ void *dns3_lookup_thread(void *data)
pthread_mutex_unlock(&dns_thread.lock); pthread_mutex_unlock(&dns_thread.lock);
kill_dns_thread(dns_obj); kill_dns_thread(dns_obj);
return 0;
} }
/* creates new thread for dns3 lookup. Only allows one lookup at a time. */ /* creates new thread for dns3 lookup. Only allows one lookup at a time. */

View File

@ -20,10 +20,6 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>

View File

@ -20,9 +20,6 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>

View File

@ -20,10 +20,6 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>

View File

@ -20,10 +20,6 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <arpa/inet.h> #include <arpa/inet.h>

View File

@ -24,10 +24,6 @@
#define _GNU_SOURCE /* needed for strcasestr() and wcwidth() */ #define _GNU_SOURCE /* needed for strcasestr() and wcwidth() */
#endif #endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>

View File

@ -20,10 +20,6 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdbool.h> #include <stdbool.h>

View File

@ -20,10 +20,6 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>

View File

@ -20,10 +20,6 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>

View File

@ -20,10 +20,6 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <wchar.h> #include <wchar.h>

View File

@ -20,10 +20,6 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@ -20,14 +20,14 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifndef SIGWINCH #ifndef SIGWINCH
#define SIGWINCH 28 #define SIGWINCH 28
#endif #endif
#ifndef SIGINT
#define SIGINT 2
#endif
#include <curses.h> #include <curses.h>
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>

View File

@ -20,10 +20,6 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <wchar.h> #include <wchar.h>
@ -36,7 +32,7 @@
/* Adds char to line at pos */ /* Adds char to line at pos */
void add_char_to_buf(ChatContext *ctx, wint_t ch) void add_char_to_buf(ChatContext *ctx, wint_t ch)
{ {
if (ctx->pos < 0 || ctx->len >= MAX_STR_SIZE) if (ctx->len >= MAX_STR_SIZE)
return; return;
wmemmove(&ctx->line[ctx->pos + 1], &ctx->line[ctx->pos], ctx->len - ctx->pos); wmemmove(&ctx->line[ctx->pos + 1], &ctx->line[ctx->pos], ctx->len - ctx->pos);

View File

@ -20,10 +20,6 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <pthread.h> #include <pthread.h>