History

Fix fdclose conflict in drawterm (thanks Christos Margiolis)

cinap_lenrek committed 5 years ago

Commit e65af5d1 parent 823eea41 file · +3 −3Browse files

Unified · Split

kern/sysfile.c+3−3
@@ -293,7 +293,7 @@ _sysopen(char *name, int mode) · 292 unmodified lines
293}293}
294 294
295static void295static void
296fdclose(int fd, int flag)296_fdclose(int fd, int flag)
297{297{
298 int i;298 int i;
299 Chan *c;299 Chan *c;
@@ -325,7 +325,7 @@ long · 25 unmodified lines
325_sysclose(int fd)325_sysclose(int fd)
326{326{
327 fdtochan(fd, -1, 0, 0);327 fdtochan(fd, -1, 0, 0);
328 fdclose(fd, 0);328 _fdclose(fd, 0);
329 329
330 return 0;330 return 0;
331}331}
@@ -698,7 +698,7 @@ bindmount(int ismount, int fd, int afd, char* arg0, char* arg1, int flag, char* · 366 unmodified lines
698 poperror();698 poperror();
699 cclose(c0);699 cclose(c0);
700 if(ismount){700 if(ismount){
701 fdclose(fd, 0);701 _fdclose(fd, 0);
702 poperror();702 poperror();
703 free(spec);703 free(spec);
704 }704 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t