@@ -30,19 +30,18 @@ int main(int argc, char *argv[]){
3030 return 0 ;
3131 }
3232
33- starter_callback_name = CArgvParse_get_flag (& args ,STARTER_CALLBACK_FLAGS ,FLAGS_SIZE ,0 );
34- int port_num = -1 ;
35- if (!starter_callback_name ){
36- const char * port = CArgvParse_get_flag (& args ,PORTS_FLAGS ,FLAGS_SIZE ,0 );
33+ const char * port = CArgvParse_get_flag (& args ,PORTS_FLAGS ,FLAGS_SIZE ,0 );
34+ if (!port ){
3735 printf ("Port not provided\n" );
3836 return 1 ;
39- port_num = atoi ( port );
40- if ( port_num <= 0 ){
41- printf ( "--port not valid\n" );
42- return 1 ;
43- }
37+ }
38+ int port_num = atoi ( port );
39+ if ( port_num <= 0 ){
40+ printf ( "--port not valid\n" ) ;
41+ return 1 ;
4442 }
4543
44+
4645
4746 const char * dynamic_lib_entrie = CArgvParse_get_flag (& args ,DYNAMIC_LIV_FLAGS ,FLAGS_SIZE ,0 );
4847 if (!dynamic_lib_entrie ){
@@ -87,45 +86,7 @@ int main(int argc, char *argv[]){
8786 }
8887
8988
90- CwebServer server ;
91- if (starter_callback_name ){
92- #ifdef _WIN32
93- HMODULE handler = LoadLibrary (dynamic_lib_path );
94- if (!handler ){
95- printf ("Error loading dynamic library for starter callback: %lu\n" , GetLastError ());
96- return 1 ;
97- }
98- CwebServer (* starter_callback )(int argc , char * argv []) = (CwebServer (* )(int argc , char * argv []))dlsym (handler ,starter_callback_name );
99- if (!starter_callback ){
100- printf ("Starter callback function not found\n" );
101- FreeLibrary (handler );
102- return 1 ;
103- }
104- server = starter_callback (argc ,argv );
105- CwebServer_start (& server );
106- FreeLibrary (handler );
107- return 0 ;
108- #else
109- void * handler = dlopen (dynamic_lib_path , RTLD_LAZY );
110- if (!handler ){
111- printf ("Error loading dynamic library for starter callback: %s\n" , dlerror ());
112- return 1 ;
113- }
114- CwebServer (* starter_callback )(int argc , char * argv []) = (CwebServer (* )(int argc , char * argv []))dlsym (handler ,starter_callback_name );
115- if (!starter_callback ){
116- printf ("Starter callback function not found\n" );
117- dlclose (handler );
118- return 1 ;
119- }
120- server = starter_callback (argc ,argv );
121- CwebServer_start (& server );
122- dlclose (handler );
123- return 0 ;
124- #endif
125- }
126-
127-
128- server = newCwebSever (port_num , main_sever );
89+ CwebServer server = newCwebSever (port_num , main_sever );
12990 CwebServer_start (& server );
13091 return 0 ;
13192}
0 commit comments