nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

Spelling: occurred

Browse source
This commit is contained in:
Josh Soref 2013-06-20 11:29:03 -04:00
parent 7431973616
commit 201ab858d6
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/mbr/mbr.S
View file

@ -134,7 +134,7 @@ check_timeout:
cmpb ds:counter_timeout, 0x00 cmpb ds:counter_timeout, 0x00
jnz wait_for_keyboard jnz wait_for_keyboard
boot_fixed_disk: # Timeout occured => boot second bootable disk (non USB) boot_fixed_disk: # Timeout occurred => boot second bootable disk (non USB)
call restore_rtc_vect # Remove our RTC override call restore_rtc_vect # Remove our RTC override
movb ds:partition_table, 0x81 # target we want to swap with 0x80 movb ds:partition_table, 0x81 # target we want to swap with 0x80
push 0x0080 push 0x0080

6
src/parser.c
View file

@ -345,7 +345,7 @@ out:
if (fd_in != NULL) fclose(fd_in); if (fd_in != NULL) fclose(fd_in);
if (fd_out != NULL) fclose(fd_out); if (fd_out != NULL) fclose(fd_out);
// If an insertion occured, delete existing file and use the new one // If an insertion occurred, delete existing file and use the new one
if (ret != NULL) { if (ret != NULL) {
// We're in Windows text mode => Remove CRs if requested // We're in Windows text mode => Remove CRs if requested
fd_in = _wfopen(wtmpname, L"rb"); fd_in = _wfopen(wtmpname, L"rb");
@ -378,7 +378,7 @@ out:
// Search for a specific 'src' substring data for all occurences of 'token', and replace // Search for a specific 'src' substring data for all occurences of 'token', and replace
// it with 'rep'. File can be ANSI or UNICODE and is overwritten. Parameters are UTF-8. // it with 'rep'. File can be ANSI or UNICODE and is overwritten. Parameters are UTF-8.
// The parsed line is of the form: [ ]token[ ]data // The parsed line is of the form: [ ]token[ ]data
// Returns a pointer to rep if replacement occured, NULL otherwise // Returns a pointer to rep if replacement occurred, NULL otherwise
char* replace_in_token_data(const char* filename, const char* token, const char* src, const char* rep, BOOL dos2unix) char* replace_in_token_data(const char* filename, const char* token, const char* src, const char* rep, BOOL dos2unix)
{ {
const wchar_t* outmode[] = { L"w", L"w, ccs=UTF-8", L"w, ccs=UTF-16LE" }; const wchar_t* outmode[] = { L"w", L"w, ccs=UTF-8", L"w, ccs=UTF-16LE" };
@ -491,7 +491,7 @@ out:
if (fd_in != NULL) fclose(fd_in); if (fd_in != NULL) fclose(fd_in);
if (fd_out != NULL) fclose(fd_out); if (fd_out != NULL) fclose(fd_out);
// If a replacement occured, delete existing file and use the new one // If a replacement occurred, delete existing file and use the new one
if (ret != NULL) { if (ret != NULL) {
// We're in Windows text mode => Remove CRs if requested // We're in Windows text mode => Remove CRs if requested
fd_in = _wfopen(wtmpname, L"rb"); fd_in = _wfopen(wtmpname, L"rb");