ObjFW  Diff

Differences From Artifact [03e1d50c2c]:

To Artifact [76191c1054]:


140
141
142
143
144
145
146



147
148


149


150
151
152



153
154
155
156
157





158
159
160
161
162
163
164
140
141
142
143
144
145
146
147
148
149


150
151
152
153
154



155
156
157





158
159
160
161
162
163
164
165
166
167
168
169







+
+
+
-
-
+
+

+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+







	uint_fast8_t i;

	for (i = 0; i < OF_BACKTRACE_SIZE && _backtrace[i] != NULL; i++) {
# ifdef HAVE_DLADDR
		Dl_info info;

		if (dladdr(_backtrace[i], &info)) {
			OFString *frame;

			if (info.dli_sname != NULL) {
			ptrdiff_t offset = (char*)_backtrace[i] -
			    (char*)info.dli_saddr;
				ptrdiff_t offset = (char*)_backtrace[i] -
				    (char*)info.dli_saddr;

				frame = [OFString stringWithFormat:
				    @"%p <%s+%td> at %s",
			if (info.dli_sname == NULL)
				info.dli_sname = "??";

				    _backtrace[i], info.dli_sname, offset,
				    info.dli_fname];
			} else
			[backtrace addObject:
			    [OFString stringWithFormat: @"%p <%s+%td> at %s",
							_backtrace[i],
							info.dli_sname, offset,
							info.dli_fname]];
				frame = [OFString stringWithFormat:
				    @"%p <?" @"?> at %s",
				    _backtrace[i], info.dli_fname];

			[backtrace addObject: frame];
		} else
# endif
			[backtrace addObject:
			    [OFString stringWithFormat: @"%p", _backtrace[i]]];
	}

	objc_autoreleasePoolPop(pool);