external/uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renamed all "struct user" to hub_user in order to resolve a naming conflict on OpenWRT.

Browse Source 
Basically: sed -i 's/struct user/struct hub_user/g' `find -type f`
This commit is contained in:
Jan Vidar Krey
2009-07-26 01:47:17 +02:00
parent 2ac5cc19cb
commit 367871e476
25 changed files with 249 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autotest/test_hub.tcc
View File

@@ -10,8 +10,8 @@ static void create_test_user()
if (g_user)
return;
g_user = (struct user*) malloc(sizeof(struct user));
memset(g_user, 0, sizeof(struct user));
g_user = (struct hub_user*) malloc(sizeof(struct hub_user));
memset(g_user, 0, sizeof(struct hub_user));
memcpy(g_user->id.nick, "exotic-tester", 13);
g_user->sid = 1;
}

8
autotest/test_inf.tcc
View File

@@ -5,15 +5,15 @@
#define USER_NICK "Friend"
#define USER_SID "AAAB"
static struct user* inf_user = 0;
static struct hub_user* inf_user = 0;
static struct hub_info* inf_hub = 0;
extern int hub_handle_info_login(struct hub_info* hub, struct user* user, struct adc_message* cmd);
extern int hub_handle_info_login(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd);
static void inf_create_hub()
{
inf_hub = (struct hub_info*) hub_malloc_zero(sizeof(struct hub_info));
inf_hub->users = (struct user_manager*) hub_malloc_zero(sizeof(struct user_manager));
inf_hub->users = (struct hub_user_manager*) hub_malloc_zero(sizeof(struct hub_user_manager));
inf_hub->users->list = list_create();
inf_hub->users->free_sid = 1;
@@ -40,7 +40,7 @@ static void inf_destroy_hub()
static void inf_create_user()
{
if (inf_user) return;
inf_user = (struct user*) hub_malloc_zero(sizeof(struct user));
inf_user = (struct hub_user*) hub_malloc_zero(sizeof(struct hub_user));
inf_user->id.sid = 1;
inf_user->net.sd = -1;
inf_user->limits.upload_slots = 1;

6
autotest/test_message.tcc
View File

@@ -1,5 +1,5 @@
#include <uhub.h>
static struct user* g_user = 0;
static struct hub_user* g_user = 0;
static const char* test_string1 = "IINF AAfoo BBbar CCwhat\n";
static const char* test_string2 = "BMSG AAAB Hello\\sWorld!\n";
static const char* test_string3 = "BINF AAAB IDAN7ZMSLIEBL53OPTM7WXGSTXUS3XOY6KQS5LBGX NIFriend DEstuff SL3 SS0 SF0 VEQuickDC/0.4.17 US6430 SUADC0,TCP4,UDP4 I4127.0.0.1 HO5 HN1 AW\n";
@@ -11,8 +11,8 @@ static void create_test_user()
if (g_user)
return;
g_user = (struct user*) malloc(sizeof(struct user));
memset(g_user, 0, sizeof(struct user));
g_user = (struct hub_user*) malloc(sizeof(struct hub_user));
memset(g_user, 0, sizeof(struct hub_user));
memcpy(g_user->id.nick, "exotic-tester", 13);
g_user->id.sid = 1;
}

4
autotest/test_usermanager.tcc
View File

@@ -3,7 +3,7 @@
#define MAX_USERS 64
static struct hub_info um_hub;
static struct user um_user[MAX_USERS];
static struct hub_user um_user[MAX_USERS];
EXO_TEST(um_test_setup, {
int i = 0;
@@ -11,7 +11,7 @@ EXO_TEST(um_test_setup, {
for (i = 0; i < MAX_USERS; i++)
{
memset(&um_user[i], 0, sizeof(struct user));
memset(&um_user[i], 0, sizeof(struct hub_user));
um_user[i].id.sid = i+1;
um_user[i].net.sd = -1;
}