From 8e78f9b649b0f97bc70fd3b7b1341e5ad9f18db5 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Fri, 2 Sep 2011 15:16:04 -0500 Subject: [PATCH] improve all includes using iwyu --- example-sdl/sdl.c | 27 +++++++++++++++------------ example/example.c | 7 +++---- src/classic.c | 8 ++++---- src/dynamics.c | 6 ++---- src/events.c | 27 ++++++++++++++------------- src/guitar_hero_3.c | 8 ++++---- src/io.c | 2 +- src/io_nix.c | 17 ++++++++++------- src/ir.c | 5 ++--- src/nunchuk.c | 8 ++++---- src/wiiboard.c | 6 ++---- src/wiiuse.c | 11 ++++------- 12 files changed, 65 insertions(+), 67 deletions(-) diff --git a/example-sdl/sdl.c b/example-sdl/sdl.c index 0c0cdfb..919a733 100644 --- a/example-sdl/sdl.c +++ b/example-sdl/sdl.c @@ -21,23 +21,26 @@ * $Header$ */ -#include -#include +#include -#ifndef WIN32 - #include - #include - #include +#include // for SDL_Init, SDL_Quit +#include // for SDL_GetError +#include // for SDL_Event, SDL_PollEvent, etc +#include // for SDL_GL_SetAttribute, etc + +#include // for glVertex3f, GLfloat, etc +#include // for gluLookAt, gluOrtho2D, etc +#include // for glutSolidTeapot + +#ifndef WIIUSE_WIN32 + #include // for timeval, gettimeofday + #include // for time + #include // for usleep #else #include #endif -#include -#include -#include -#include - -#include +#include // for printf #define PI 3.14159265358979323846 #define PI_DIV_180 0.017453292519943296 diff --git a/example/example.c b/example/example.c index 7d045ea..4b9f643 100644 --- a/example/example.c +++ b/example/example.c @@ -34,14 +34,13 @@ * This file is an example of how to use the wiiuse library. */ -#include -#include +#include // for printf #ifndef WIN32 - #include + #include // for usleep #endif -#include "wiiuse.h" +#include "wiiuse.h" // for wiimote_t, classic_ctrl_t, etc #define MAX_WIIMOTES 4 diff --git a/src/classic.c b/src/classic.c index c09dd5f..6dc86be 100644 --- a/src/classic.c +++ b/src/classic.c @@ -32,11 +32,11 @@ */ #include "classic.h" -#include "dynamics.h" -#include "events.h" +#include "dynamics.h" // for calc_joystick_state +#include "events.h" // for handshake_expansion -#include -#include +#include // for malloc +#include // for memset static void classic_ctrl_pressed_buttons(struct classic_ctrl_t* cc, short now); diff --git a/src/dynamics.c b/src/dynamics.c index 41f1297..5797316 100644 --- a/src/dynamics.c +++ b/src/dynamics.c @@ -36,11 +36,9 @@ */ #include "dynamics.h" -#include "ir.h" -#include -#include -#include +#include // for atan2f, atanf, sqrt +#include // for abs /** diff --git a/src/events.c b/src/events.c index 2d21492..708eacc 100644 --- a/src/events.c +++ b/src/events.c @@ -36,23 +36,24 @@ #include "wiiuse_internal.h" #include "events.h" -#include "io.h" -#include "dynamics.h" -#include "ir.h" -#include "nunchuk.h" -#include "classic.h" -#include "guitar_hero_3.h" -#include "wiiboard.h" + +#include "classic.h" // for classic_ctrl_disconnected, etc +#include "dynamics.h" // for calculate_gforce, etc +#include "guitar_hero_3.h" // for guitar_hero_3_disconnected, etc +#include "ir.h" // for calculate_basic_ir, etc +#include "nunchuk.h" // for nunchuk_disconnected, etc +#include "wiiboard.h" // for wii_board_disconnected, etc #ifndef WIIUSE_WIN32 - #include - #include - #include + #include // for timeval + #include // for select, fd_set + #include // for read #endif -#include -#include -#include +#include // for errno +#include // for printf, perror +#include // for free, malloc +#include // for memcpy, memset static void idle_cycle(struct wiimote_t* wm); static void clear_dirty_reads(struct wiimote_t* wm); diff --git a/src/guitar_hero_3.c b/src/guitar_hero_3.c index af2d906..c6fe20a 100644 --- a/src/guitar_hero_3.c +++ b/src/guitar_hero_3.c @@ -33,11 +33,11 @@ #include "guitar_hero_3.h" -#include "dynamics.h" -#include "events.h" +#include "dynamics.h" // for calc_joystick_state +#include "events.h" // for handshake_expansion -#include -#include +#include // for malloc +#include // for memset static void guitar_hero_3_pressed_buttons(struct guitar_hero_3_t* gh3, short now); diff --git a/src/io.c b/src/io.c index 8afdf79..d150f7e 100644 --- a/src/io.c +++ b/src/io.c @@ -32,7 +32,7 @@ */ #include "io.h" -#include +#include // for free, malloc /** diff --git a/src/io_nix.c b/src/io_nix.c index 4eb290e..931ca1e 100644 --- a/src/io_nix.c +++ b/src/io_nix.c @@ -35,14 +35,17 @@ #ifdef WIIUSE_BLUEZ -#include -#include -#include -#include -#include -#include -#include +#include // for ba2str, str2ba +#include // for inquiry_info +#include // for hci_get_route, hci_inquiry, etc +#include // for sockaddr_l2 + +#include // for perror +#include // for memset +#include // for connect, socket +#include // for close, write +#include static int wiiuse_connect_single(struct wiimote_t* wm, char* address); diff --git a/src/ir.c b/src/ir.c index a4ecd31..36fc749 100644 --- a/src/ir.c +++ b/src/ir.c @@ -33,10 +33,9 @@ #include "ir.h" -#include - +#include // for atanf, cos, sin, sqrt #ifndef WIIUSE_WIN32 - #include + #include // for usleep #endif static int get_ir_sens(struct wiimote_t* wm, char** block1, char** block2); diff --git a/src/nunchuk.c b/src/nunchuk.c index 1d92526..b8471bd 100644 --- a/src/nunchuk.c +++ b/src/nunchuk.c @@ -33,11 +33,11 @@ #include "nunchuk.h" -#include "dynamics.h" -#include "events.h" +#include "dynamics.h" // for calc_joystick_state, etc +#include "events.h" // for handshake_expansion -#include -#include +#include // for malloc +#include // for memset static void nunchuk_pressed_buttons(struct nunchuk_t* nc, byte now); diff --git a/src/wiiboard.c b/src/wiiboard.c index 9db2a87..16ef85b 100644 --- a/src/wiiboard.c +++ b/src/wiiboard.c @@ -33,11 +33,9 @@ #include "wiiboard.h" -#include "dynamics.h" -#include "events.h" -#include -#include +#include // for printf +#include // for memset /** * @brief Handle the handshake data from the wiiboard. diff --git a/src/wiiuse.c b/src/wiiuse.c index d80ae0b..96568b8 100644 --- a/src/wiiuse.c +++ b/src/wiiuse.c @@ -36,14 +36,11 @@ */ #include "wiiuse_internal.h" -#include "events.h" -#include "io.h" +#include "io.h" // for wiiuse_handshake, etc -#include - -#ifndef WIIUSE_WIN32 - #include -#endif +#include // for printf, FILE +#include // for malloc, free +#include // for memcpy, memset static int g_banner = 0;