ObjFW  Check-in [7c2b71f536]

Overview
Comment:OFFileManager: Fix nil that should be NULL
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 7c2b71f53611bf077bed4bf3fdf6c61184e595b9886c16b5047da25986fcd80e
User & Date: js on 2016-04-24 16:58:59
Other Links: manifest | tags
Context
2016-05-05
17:05
OFTLSSocket: Fix wrong protocol for delegate check-in: 55dc5a174c user: js tags: trunk
2016-04-24
16:58
OFFileManager: Fix nil that should be NULL check-in: 7c2b71f536 user: js tags: trunk
16:57
OFKernelEventObserver_epoll: Use fd + 1 as key check-in: 2c3910e9fd user: js tags: trunk
Changes

Modified src/OFFileManager.m from [75d768d86f] to [3f6812e137].

522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
# ifdef OF_HAVE_THREADS
	[passwdMutex lock];
	@try {
# endif
		of_string_encoding_t encoding =
		    [OFSystemInfo native8BitEncoding];

		if (owner != nil) {
			struct passwd *passwd = getpwuid(s.st_uid);

			*owner = [OFString stringWithCString: passwd->pw_name
						    encoding: encoding];
		}

		if (group != nil) {
			struct group *group_ = getgrgid(s.st_gid);

			*group = [OFString stringWithCString: group_->gr_name
						    encoding: encoding];
		}
# ifdef OF_HAVE_THREADS
	} @finally {







|






|







522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
# ifdef OF_HAVE_THREADS
	[passwdMutex lock];
	@try {
# endif
		of_string_encoding_t encoding =
		    [OFSystemInfo native8BitEncoding];

		if (owner != NULL) {
			struct passwd *passwd = getpwuid(s.st_uid);

			*owner = [OFString stringWithCString: passwd->pw_name
						    encoding: encoding];
		}

		if (group != NULL) {
			struct group *group_ = getgrgid(s.st_gid);

			*group = [OFString stringWithCString: group_->gr_name
						    encoding: encoding];
		}
# ifdef OF_HAVE_THREADS
	} @finally {