diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-05-24 23:12:30 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-05-24 23:12:30 +0000 |
| commit | a7a3b383f2f828cd59ad5f58d318da892ad53868 (patch) | |
| tree | 9dd2174199f7139519d2253a1b845832de100537 /sys/contrib/dev/acpica/compiler/prutils.c | |
| parent | 62b5b6ecd00aae623415a177d0a1a3a599cbfdf5 (diff) | |
| parent | fa948a817cf9dae39dc632f9bf48a8af37244a0e (diff) | |
| download | src-a7a3b383f2f828cd59ad5f58d318da892ad53868.tar.gz src-a7a3b383f2f828cd59ad5f58d318da892ad53868.zip | |
Merge ACPICA 20120518.
Notes
Notes:
svn path=/head/; revision=235945
Diffstat (limited to 'sys/contrib/dev/acpica/compiler/prutils.c')
| -rw-r--r-- | sys/contrib/dev/acpica/compiler/prutils.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sys/contrib/dev/acpica/compiler/prutils.c b/sys/contrib/dev/acpica/compiler/prutils.c index 0bbd8f5a3b26..8f9f24dc0181 100644 --- a/sys/contrib/dev/acpica/compiler/prutils.c +++ b/sys/contrib/dev/acpica/compiler/prutils.c @@ -246,13 +246,11 @@ PrOpenIncludeFile ( ASL_INCLUDE_DIR *NextDir; - /* - * start the actual include file on the next line - */ + /* Start the actual include file on the next line */ + Gbl_CurrentLineOffset++; /* Attempt to open the include file */ - /* If the file specifies an absolute path, just open it */ if ((Filename[0] == '/') || @@ -330,13 +328,10 @@ PrOpenIncludeWithPrefix ( /* Build the full pathname to the file */ - Pathname = ACPI_ALLOCATE (strlen (PrefixDir) + strlen (Filename) + 1); + Pathname = FlMergePathnames (PrefixDir, Filename); - strcpy (Pathname, PrefixDir); - strcat (Pathname, Filename); - - DbgPrint (ASL_PARSE_OUTPUT, "\n" PR_PREFIX_ID - "Opening include file: path %s\n", + DbgPrint (ASL_PARSE_OUTPUT, PR_PREFIX_ID + "Include: Opening file - \"%s\"\n", Gbl_CurrentLineNumber, Pathname); /* Attempt to open the file, push if successful */ |