tcc.c: fix previous commit "Use CString to concat linker options"

- remove redunant else branch - zero-terminate linker_arg - declare cstr_xxx as PUB_FUNC (which are functions used in tcc.c but not in the libtcc API. Useful for a tcc(.exe) that uses the libtcc.(so/dll)) - while at it, export PUB_FUNCs from dll

grischka committed 14 years ago

Commit 4274c441 parent 214564b4 files · +20 −22Browse files

Unified · Split

4 files

tcc.c +7 −9
tcc.h +6 −6
tccpp.c +6 −6
win32/build-tcc.bat +1 −1

tcc.c+7−9

     int was_pthread;
     was_pthread = 0; /* is set if commandline contains -pthread key */
     optind = 1;
     cstr_new(&linker_arg);
     while (optind < argc) {
         r = argv[optind++];
                 s->rdynamic = 1;
                 break;
             case TCC_OPTION_Wl:
-                if (!linker_arg.data_allocated)
+                if (linker_arg.size)
-                    cstr_cat(&linker_arg, optarg);
+                    --linker_arg.size, cstr_ccat(&linker_arg, ',');
-                else {
+                cstr_cat(&linker_arg, optarg);
-                    cstr_ccat(&linker_arg, ',');
+                cstr_ccat(&linker_arg, '\0');
-                    cstr_cat(&linker_arg, optarg);
-                }
                 break;
             case TCC_OPTION_E:
                 output_type = TCC_OUTPUT_PREPROCESS;
             }
         }
     }
-    if ((r = (char *) tcc_set_linker(s, (char *) linker_arg.data, TRUE)))
+    if (NULL != (r1 = tcc_set_linker(s, (char *) linker_arg.data, TRUE)))
-        tcc_error("unsupported linker option '%s'", r);
+        tcc_error("unsupported linker option '%s'", r1);
     /* fixme: these options could be different on your platform */
     if (was_pthread && output_type != TCC_OUTPUT_OBJ) {
         dynarray_add((void ***)&files, &nb_files, "-lpthread");

tcc.h+6−6

 #define inp next_inp
 #ifdef LIBTCC_AS_DLL
 # define LIBTCCAPI __declspec(dllexport)
+# define PUB_FUNC LIBTCCAPI
 #endif
 #endif
 PUB_FUNC void tcc_warning(const char *fmt, ...);
 /* other utilities */
-ST_INLN void cstr_ccat(CString *cstr, int ch);
+PUB_FUNC void cstr_ccat(CString *cstr, int ch);
-ST_FUNC void cstr_cat(CString *cstr, const char *str);
+PUB_FUNC void cstr_cat(CString *cstr, const char *str);
-ST_FUNC void cstr_wccat(CString *cstr, int ch);
+PUB_FUNC void cstr_wccat(CString *cstr, int ch);
-ST_FUNC void cstr_new(CString *cstr);
+PUB_FUNC void cstr_new(CString *cstr);
-ST_FUNC void cstr_free(CString *cstr);
+PUB_FUNC void cstr_free(CString *cstr);
-ST_FUNC void add_char(CString *cstr, int c);
 #define cstr_reset(cstr) cstr_free(cstr)
 ST_FUNC Section *new_section(TCCState *s1, const char *name, int sh_type, int sh_flags);

tccpp.c+6−6

@@ -120,7 +120,7 @@ static void cstr_realloc(CString *cstr, int new_size) · 119 unmodified lines
120	}	120	}
121		121
122	/* add a byte */	122	/* add a byte */
123	ST_INLN void cstr_ccat(CString *cstr, int ch)	123	PUB_FUNC void cstr_ccat(CString *cstr, int ch)
124	{	124	{
125	int size;	125	int size;
126	size = cstr->size + 1;	126	size = cstr->size + 1;
@@ -130,7 +130,7 @@ ST_INLN void cstr_ccat(CString *cstr, int ch) · 3 unmodified lines
130	cstr->size = size;	130	cstr->size = size;
131	}	131	}
132		132
133	ST_FUNC void cstr_cat(CString cstr, const char str)	133	PUB_FUNC void cstr_cat(CString cstr, const char str)
134	{	134	{
135	int c;	135	int c;
136	for(;;) {	136	for(;;) {
@@ -143,7 +143,7 @@ ST_FUNC void cstr_cat(CString cstr, const char str) · 6 unmodified lines
143	}	143	}
144		144
145	/* add a wide char */	145	/* add a wide char */
146	ST_FUNC void cstr_wccat(CString *cstr, int ch)	146	PUB_FUNC void cstr_wccat(CString *cstr, int ch)
147	{	147	{
148	int size;	148	int size;
149	size = cstr->size + sizeof(nwchar_t);	149	size = cstr->size + sizeof(nwchar_t);
@@ -153,20 +153,20 @@ ST_FUNC void cstr_wccat(CString *cstr, int ch) · 3 unmodified lines
153	cstr->size = size;	153	cstr->size = size;
154	}	154	}
155		155
156	ST_FUNC void cstr_new(CString *cstr)	156	PUB_FUNC void cstr_new(CString *cstr)
157	{	157	{
158	memset(cstr, 0, sizeof(CString));	158	memset(cstr, 0, sizeof(CString));
159	}	159	}
160		160
161	/* free string and reset it to NULL */	161	/* free string and reset it to NULL */
162	ST_FUNC void cstr_free(CString *cstr)	162	PUB_FUNC void cstr_free(CString *cstr)
163	{	163	{
164	tcc_free(cstr->data_allocated);	164	tcc_free(cstr->data_allocated);
165	cstr_new(cstr);	165	cstr_new(cstr);
166	}	166	}
167		167
168	/* XXX: unicode ? */	168	/* XXX: unicode ? */
169	ST_FUNC void add_char(CString *cstr, int c)	169	static void add_char(CString *cstr, int c)
170	{	170	{
171	if (c == '\'' \|\| c == '\"' \|\| c == '\\') {	171	if (c == '\'' \|\| c == '\"' \|\| c == '\\') {
172	/* XXX: could be more precise if char or string */	172	/* XXX: could be more precise if char or string */

win32/build-tcc.bat+1−1

@@ -34,7 +34,7 @@ copy ..\libtcc.h libtcc\libtcc.h · 33 unmodified lines
34	tiny_impdef libtcc.dll -o lib/libtcc.def	34	tiny_impdef libtcc.dll -o lib/libtcc.def
35		35
36	:tcc	36	:tcc
37	%CC% %target% -DONE_SOURCE ../tcc.c -o tcc.exe -ltcc -Llibtcc	37	%CC% %target% ../tcc.c -o tcc.exe -ltcc -Llibtcc
38		38
39	:copy_std_includes	39	:copy_std_includes
40	copy ..\include\*.h include	40	copy ..\include\*.h include

tcc.c: fix previous commit "Use CString to concat linker options"

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code