authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-08-09 21:48:25-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-08-09 21:48:25-04:00
log23af36c54f7e141d52d5a43e41c205bfc3667f16
tree66b8e5b6f56a7a917f7624bb098de05db39ac7ed
parent26a842c264523c007687a72ab44f4c44990b5a89

windows fs watching: fix not initializing table value

2 files changed, 3 insertions(+), 1 deletions(-)

std/event/fs.zig+1
...@@ -1056,6 +1056,7 @@ pub fn Watch(comptime V: type) type {...@@ -1056,6 +1056,7 @@ pub fn Watch(comptime V: type) type {
1056 .table_lock = event.Lock.init(self.channel.loop),1056 .table_lock = event.Lock.init(self.channel.loop),
1057 .putter = undefined,1057 .putter = undefined,
1058 };1058 };
1059 gop.kv.value = dir;
1059 assert((try dir.file_table.put(basename_utf16le_no_null, value_copy)) == null);1060 assert((try dir.file_table.put(basename_utf16le_no_null, value_copy)) == null);
1060 basename_utf16le_null_consumed = true;1061 basename_utf16le_null_consumed = true;
10611062
std/os/windows/kernel32.zig+2-1
...@@ -117,7 +117,6 @@ pub extern "kernel32" stdcallcc fn HeapCreate(flOptions: DWORD, dwInitialSize: S...@@ -117,7 +117,6 @@ pub extern "kernel32" stdcallcc fn HeapCreate(flOptions: DWORD, dwInitialSize: S
117pub extern "kernel32" stdcallcc fn HeapDestroy(hHeap: HANDLE) BOOL;117pub extern "kernel32" stdcallcc fn HeapDestroy(hHeap: HANDLE) BOOL;
118pub extern "kernel32" stdcallcc fn HeapReAlloc(hHeap: HANDLE, dwFlags: DWORD, lpMem: *c_void, dwBytes: SIZE_T) ?*c_void;118pub extern "kernel32" stdcallcc fn HeapReAlloc(hHeap: HANDLE, dwFlags: DWORD, lpMem: *c_void, dwBytes: SIZE_T) ?*c_void;
119pub extern "kernel32" stdcallcc fn HeapSize(hHeap: HANDLE, dwFlags: DWORD, lpMem: *const c_void) SIZE_T;119pub extern "kernel32" stdcallcc fn HeapSize(hHeap: HANDLE, dwFlags: DWORD, lpMem: *const c_void) SIZE_T;
120pub extern "kernel32" stdcallcc fn HeapValidate(hHeap: HANDLE, dwFlags: DWORD, lpMem: *const c_void) BOOL;
121pub extern "kernel32" stdcallcc fn HeapCompact(hHeap: HANDLE, dwFlags: DWORD) SIZE_T;120pub extern "kernel32" stdcallcc fn HeapCompact(hHeap: HANDLE, dwFlags: DWORD) SIZE_T;
122pub extern "kernel32" stdcallcc fn HeapSummary(hHeap: HANDLE, dwFlags: DWORD, lpSummary: LPHEAP_SUMMARY) BOOL;121pub extern "kernel32" stdcallcc fn HeapSummary(hHeap: HANDLE, dwFlags: DWORD, lpSummary: LPHEAP_SUMMARY) BOOL;
123122
...@@ -127,6 +126,8 @@ pub extern "kernel32" stdcallcc fn HeapAlloc(hHeap: HANDLE, dwFlags: DWORD, dwBy...@@ -127,6 +126,8 @@ pub extern "kernel32" stdcallcc fn HeapAlloc(hHeap: HANDLE, dwFlags: DWORD, dwBy
127126
128pub extern "kernel32" stdcallcc fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem: *c_void) BOOL;127pub extern "kernel32" stdcallcc fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem: *c_void) BOOL;
129128
129pub extern "kernel32" stdcallcc fn HeapValidate(hHeap: HANDLE, dwFlags: DWORD, lpMem: ?*const c_void) BOOL;
130
130pub extern "kernel32" stdcallcc fn MoveFileExA(131pub extern "kernel32" stdcallcc fn MoveFileExA(
131 lpExistingFileName: LPCSTR,132 lpExistingFileName: LPCSTR,
132 lpNewFileName: LPCSTR,133 lpNewFileName: LPCSTR,