xserver: Branch 'server-21.1-branch' - 2 commits

[GitLab Mirror]

 hw/xfree86/common/xf86sbusBus.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 203e0667d21953737537d1991ec76b768fe588ae
Author: Matt Turner <mattst88 at gmail.com>
Date:   Mon Dec 16 22:38:24 2024 -0500

    hw/xfree86: Fix -Wincompatible-pointer-types sbus compile failure
    
    ```
    ../hw/xfree86/common/xf86sbusBus.c: In function ‘xf86SbusConfigureNewDev’:
    ../hw/xfree86/common/xf86sbusBus.c:751:21: error: passing argument 1 of ‘XNFasprintf’ from incompatible pointer type [-Wincompatible-pointer-types]
      751 |         XNFasprintf(&GDev->busID, "SBUS:%s", promPath);
          |                     ^~~~~~~~~~~~
          |                     |
          |                     const char **
    ```
    
    Apply the same fix as in commit e1e01d2e3 ("xfree86/common: Warning
    fixes. Mostly const string handling.")
    
    (cherry picked from commit bdacb100bf6a551bc9045f7f0048cbb99eb3db5a)
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1752>

diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c
index a4b114af0..ae4e45773 100644
--- a/hw/xfree86/common/xf86sbusBus.c
+++ b/hw/xfree86/common/xf86sbusBus.c
@@ -740,6 +740,7 @@ void
 xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec * GDev)
 {
     char *promPath = NULL;
+    char *tmp;
 
     sBus = (sbusDevicePtr) busData;
     GDev->identifier = sBus->descr;
@@ -748,10 +749,11 @@ xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec * GDev)
         sparcPromClose();
     }
     if (promPath) {
-        XNFasprintf(&GDev->busID, "SBUS:%s", promPath);
+        XNFasprintf(&tmp, "SBUS:%s", promPath);
         free(promPath);
     }
     else {
-        XNFasprintf(&GDev->busID, "SBUS:fb%d", sBus->fbNum);
+        XNFasprintf(&tmp, "SBUS:fb%d", sBus->fbNum);
     }
+    GDev->busID = tmp;
 }
commit 1958e0f25b6b46940625b407a5e15b39fa648b26
Author: Matt Turner <mattst88 at gmail.com>
Date:   Mon Dec 16 22:38:03 2024 -0500

    hw/xfree86: Fix -Wmissing-prototypes warnings
    
    None of these functions are used elsewhere in the Xserver nor in any of
    the xf86-video-sun* DDXs.
    
    (cherry picked from commit 00a96cd82a7be08f421dcbe3aa628fdbc7c8d856)
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1752>

diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c
index 119211dc5..a4b114af0 100644
--- a/hw/xfree86/common/xf86sbusBus.c
+++ b/hw/xfree86/common/xf86sbusBus.c
@@ -244,7 +244,7 @@ xf86SbusProbe(void)
  * in the correct format for a SBUS bus id.
  */
 
-Bool
+static Bool
 xf86ParseSbusBusString(const char *busID, int *fbNum)
 {
     /*
@@ -316,7 +316,7 @@ xf86ParseSbusBusString(const char *busID, int *fbNum)
  * Compare a BUS ID string with a SBUS bus id.  Return TRUE if they match.
  */
 
-Bool
+static Bool
 xf86CompareSbusBusString(const char *busID, int fbNum)
 {
     int iFbNum;
@@ -333,7 +333,7 @@ xf86CompareSbusBusString(const char *busID, int fbNum)
  * Check if the slot requested is free.  If it is already in use, return FALSE.
  */
 
-Bool
+static Bool
 xf86CheckSbusSlot(int fbNum)
 {
     int i;
@@ -354,7 +354,7 @@ xf86CheckSbusSlot(int fbNum)
  * Otherwise, claim the slot for the screen requesting it.
  */
 
-int
+static int
 xf86ClaimSbusSlot(sbusDevicePtr psdp, DriverPtr drvp, GDevPtr dev, Bool active)
 {
     EntityPtr p = NULL;