Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix to 5899; xpidl now looks for its target file where it's told to rather than eagerly plucking it out of the supplied includes directories.

Browse Source 
Also removed an obsolete check against libIDL 0.6.2.
This commit is contained in:
mccabe%netscape.com 1999-05-04 10:52:20 +00:00
parent d9a7d33e9a
commit a04bdb34e3
2 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xpcom/tools/xpidl/xpidl_idl.c
View File

@ -216,8 +216,21 @@ input_callback(IDL_input_reason reason, union IDL_input_data *cb_data,
switch(reason) {
case IDL_INPUT_REASON_INIT:
new_data = new_input_callback_data(cb_data->init.filename,
stack->include_path);
if (data == NULL || data->next == NULL) {
/*
* This is the first file being processed. As it's the target
* file, we only look for it in the first entry in the include
* path, which we assume to be the current directory.
*/
IncludePathEntry first_entry = { stack->include_path->directory,
NULL };
new_data = new_input_callback_data(cb_data->init.filename,
&first_entry);
} else {
new_data = new_input_callback_data(cb_data->init.filename,
stack->include_path);
}
if (!new_data)
return -1;
@ -464,6 +477,9 @@ xpidl_process_idl(char *filename, IncludePathEntry *include_path,
gboolean ok;
char *fopen_mode;
/* Initialize so that stack->top, etc. doesn't come up as garbage. */
memset(&stack, 0, sizeof(struct input_callback_stack));
stack.includes = g_hash_table_new(g_str_hash, g_str_equal);
if (!stack.includes) {
fprintf(stderr, "failed to create hashtable (EOM?)\n");
@ -488,9 +504,7 @@ xpidl_process_idl(char *filename, IncludePathEntry *include_path,
rv = IDL_parse_filename_with_input(filename, input_callback, &stack,
msg_callback, &top,
&state.ns,
#if LIBIDL_VERSION_CODE >= LIBIDL_VERSION (0,6,2)
IDLF_IGNORE_FORWARDS |
#endif
IDLF_XPIDL,
enable_warnings ? IDL_WARNING1 :
IDL_ERROR);

22
xpcom/typelib/xpidl/xpidl_idl.c
View File

@ -216,8 +216,21 @@ input_callback(IDL_input_reason reason, union IDL_input_data *cb_data,
switch(reason) {
case IDL_INPUT_REASON_INIT:
new_data = new_input_callback_data(cb_data->init.filename,
stack->include_path);
if (data == NULL || data->next == NULL) {
/*
* This is the first file being processed. As it's the target
* file, we only look for it in the first entry in the include
* path, which we assume to be the current directory.
*/
IncludePathEntry first_entry = { stack->include_path->directory,
NULL };
new_data = new_input_callback_data(cb_data->init.filename,
&first_entry);
} else {
new_data = new_input_callback_data(cb_data->init.filename,
stack->include_path);
}
if (!new_data)
return -1;
@ -464,6 +477,9 @@ xpidl_process_idl(char *filename, IncludePathEntry *include_path,
gboolean ok;
char *fopen_mode;
/* Initialize so that stack->top, etc. doesn't come up as garbage. */
memset(&stack, 0, sizeof(struct input_callback_stack));
stack.includes = g_hash_table_new(g_str_hash, g_str_equal);
if (!stack.includes) {
fprintf(stderr, "failed to create hashtable (EOM?)\n");
@ -488,9 +504,7 @@ xpidl_process_idl(char *filename, IncludePathEntry *include_path,
rv = IDL_parse_filename_with_input(filename, input_callback, &stack,
msg_callback, &top,
&state.ns,
#if LIBIDL_VERSION_CODE >= LIBIDL_VERSION (0,6,2)
IDLF_IGNORE_FORWARDS |
#endif
IDLF_XPIDL,
enable_warnings ? IDL_WARNING1 :
IDL_ERROR);