[sr-dev] git:master:9a50e380: usrloc: reformat exported structures to be more readable