Changeset 192565b in mainline for uspace/app/taskdump/symtab.c

Timestamp:

2013-05-27T13:18:13Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f2c19b0

Parents:

d120133 (diff), c90aed4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/taskdump/symtab.c (modified) (1 diff)

uspace/app/taskdump/symtab.c

@@ -267 +267 @@
                         continue;
 
-                if (best_name == NULL || (saddr <= addr && saddr > best_addr)) {
+                if (saddr <= addr && (best_name == NULL || saddr > best_addr)) {
                         best_name = sname;
                         best_addr = saddr;