Sync FSX with FSFS.  Cleanly merge r1639414 from FSFS and update
called function named to FSX.

This ports a minor function reuse improvement to FSX.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1645589 13f79535-47bb-0310-9956-ffa450edef68