[client] cosmetics/naming cleanup

client/src/app.c

@@ -130,7 +130,7 @@ void app_mouseTrace(const char * file, unsigned int line,
     return;
 
   flockfile(stderr);
-  debug_info(file, line, function, "Mouse %06" PRIu64 ": %s", seq,
+  debug_info(file, line, function, "Mouse %06lu: %s", seq,
       message);
   funlockfile(stderr);
 }

client/src/clipboard.c

@@ -389,7 +389,7 @@ static void resetRemote(void)
   LG_UNLOCK(clipboard.stateLock);
   LG_UNLOCK(clipboard.requestLock);
 
-  lgClipboardFiles_providerUnavailable();
+  clipboardFiles_providerUnavailable();
 
   LG_LOCK(clipboard.callbackLock);
   cancelRequestsNL(NULL, 0, true, LG_CLIPBOARD_CANCEL_UNAVAILABLE);
@@ -522,7 +522,7 @@ static void eventNotice(void * opaque,
   LG_UNLOCK(clipboard.stateLock);
   LG_UNLOCK(clipboard.requestLock);
   if (!hasFiles)
-    lgClipboardFiles_remoteClear();
+    clipboardFiles_remoteClear();
   LG_UNLOCK(clipboard.fileLock);
 
   LG_LOCK(clipboard.callbackLock);
@@ -545,7 +545,7 @@ static void eventNotice(void * opaque,
   if (notice && active)
   {
     if (type != LG_CLIPBOARD_DATA_FILES ||
-        lgClipboardFiles_remoteReady(fileDataset))
+        clipboardFiles_remoteReady(fileDataset))
       g_state.ds->cbNotice(type);
   }
   else if (release && active && g_state.ds->cbRelease)
@@ -948,7 +948,7 @@ static void eventRelease(void * opaque)
   LG_UNLOCK(clipboard.requestLock);
 
   LG_LOCK(clipboard.fileLock);
-  lgClipboardFiles_remoteClear();
+  clipboardFiles_remoteClear();
   LG_UNLOCK(clipboard.fileLock);
 
   LG_LOCK(clipboard.callbackLock);
@@ -1097,13 +1097,13 @@ static void eventFileOffer(void * opaque, uint64_t dataset)
   LG_LOCK(clipboard.stateLock);
   clipboard.remoteFileDataset = dataset;
   LG_UNLOCK(clipboard.stateLock);
-  if (!lgClipboardFiles_remoteOffer(dataset))
+  if (!clipboardFiles_remoteOffer(dataset))
   {
     LG_LOCK(clipboard.stateLock);
     if (clipboard.remoteFileDataset == dataset)
       clipboard.remoteFileDataset = 0;
     LG_UNLOCK(clipboard.stateLock);
-    lgClipboardFiles_remoteClear();
+    clipboardFiles_remoteClear();
   }
   LG_UNLOCK(clipboard.fileLock);
 }
@@ -1117,7 +1117,7 @@ static void eventFileAcquire(void * opaque, uint64_t dataset,
     LG_UNLOCK(clipboard.fileLock);
     return;
   }
-  lgClipboardFiles_localAcquire(dataset, acquisition);
+  clipboardFiles_localAcquire(dataset, acquisition);
   LG_UNLOCK(clipboard.fileLock);
 }
 
@@ -1130,7 +1130,7 @@ static void eventFileAcquired(void * opaque, uint64_t dataset,
     LG_UNLOCK(clipboard.fileLock);
     return;
   }
-  lgClipboardFiles_remoteAcquired(dataset, acquisition, error);
+  clipboardFiles_remoteAcquired(dataset, acquisition, error);
   LG_UNLOCK(clipboard.fileLock);
 }
 
@@ -1143,7 +1143,7 @@ static void eventFileRelease(void * opaque, uint64_t dataset,
     LG_UNLOCK(clipboard.fileLock);
     return;
   }
-  lgClipboardFiles_localRelease(dataset, acquisition);
+  clipboardFiles_localRelease(dataset, acquisition);
   LG_UNLOCK(clipboard.fileLock);
 }
 
@@ -1156,7 +1156,7 @@ static void eventFileRequest(void * opaque,
     LG_UNLOCK(clipboard.fileLock);
     return;
   }
-  lgClipboardFiles_localRequest(request);
+  clipboardFiles_localRequest(request);
   LG_UNLOCK(clipboard.fileLock);
 }
 
@@ -1170,7 +1170,7 @@ static LG_ClipboardResult eventFileDataBegin(void * opaque,
     return LG_CLIPBOARD_RESULT_FAILED;
   }
   const LG_ClipboardResult result =
-    lgClipboardFiles_remoteDataBegin(request, sizeHint);
+    clipboardFiles_remoteDataBegin(request, sizeHint);
   LG_UNLOCK(clipboard.fileLock);
   return result;
 }
@@ -1185,7 +1185,7 @@ static LG_ClipboardResult eventFileDataChunk(void * opaque,
     LG_UNLOCK(clipboard.fileLock);
     return LG_CLIPBOARD_RESULT_FAILED;
   }
-  const LG_ClipboardResult result = lgClipboardFiles_remoteDataChunk(
+  const LG_ClipboardResult result = clipboardFiles_remoteDataChunk(
       request, responseOffset, data, size);
   LG_UNLOCK(clipboard.fileLock);
   return result;
@@ -1201,7 +1201,7 @@ static LG_ClipboardResult eventFileDataEnd(void * opaque,
     return LG_CLIPBOARD_RESULT_FAILED;
   }
   const LG_ClipboardResult result =
-    lgClipboardFiles_remoteDataEnd(request, finalSize);
+    clipboardFiles_remoteDataEnd(request, finalSize);
   LG_UNLOCK(clipboard.fileLock);
   return result;
 }
@@ -1214,7 +1214,7 @@ static void eventFileDataReady(void * opaque, uint64_t request)
     LG_UNLOCK(clipboard.fileLock);
     return;
   }
-  lgClipboardFiles_localReady(request);
+  clipboardFiles_localReady(request);
   LG_UNLOCK(clipboard.fileLock);
 }
 
@@ -1227,8 +1227,8 @@ static void eventFileCancel(void * opaque, uint64_t dataset,
     LG_UNLOCK(clipboard.fileLock);
     return;
   }
-  lgClipboardFiles_remoteCancel(dataset, request, reason);
-  lgClipboardFiles_localCancel(dataset, request, reason);
+  clipboardFiles_remoteCancel(dataset, request, reason);
+  clipboardFiles_localCancel(dataset, request, reason);
   LG_UNLOCK(clipboard.fileLock);
 }
 
@@ -1386,7 +1386,7 @@ static void setBinding(ClipboardBinding * target,
   LG_UNLOCK(clipboard.registrationLock);
 }
 
-bool lgClipboard_init(void)
+bool clipboard_init(void)
 {
   memset(&clipboard, 0, sizeof(clipboard));
   LG_LOCK_INIT(clipboard.registrationLock);
@@ -1400,7 +1400,7 @@ bool lgClipboard_init(void)
   clipboard.remoteType        = LG_CLIPBOARD_DATA_NONE;
   clipboard.remoteRequestType = LG_CLIPBOARD_DATA_NONE;
   clipboard.requests          = ll_new();
-  if (!lgClipboardFiles_init())
+  if (!clipboardFiles_init())
   {
     DEBUG_ERROR("Failed to initialize clipboard file transfer");
     return false;
@@ -1408,12 +1408,12 @@ bool lgClipboard_init(void)
   return true;
 }
 
-void lgClipboard_free(void)
+void clipboard_free(void)
 {
-  lgClipboard_setLocalAvailable(false);
-  lgClipboard_setTransport(NULL, NULL);
-  lgClipboard_setFallback(NULL, NULL);
-  lgClipboardFiles_free();
+  clipboard_setLocalAvailable(false);
+  clipboard_setTransport(NULL, NULL);
+  clipboard_setFallback(NULL, NULL);
+  clipboardFiles_free();
   LG_LOCK(clipboard.callbackLock);
   cancelRequestsNL(NULL, 0, true, LG_CLIPBOARD_CANCEL_UNAVAILABLE);
   LG_UNLOCK(clipboard.callbackLock);
@@ -1433,7 +1433,7 @@ void lgClipboard_free(void)
   LG_LOCK_FREE(clipboard.registrationLock);
 }
 
-void lgClipboard_setLocalAvailable(bool available)
+void clipboard_setLocalAvailable(bool available)
 {
   bool notice;
   bool release;
@@ -1459,7 +1459,7 @@ void lgClipboard_setLocalAvailable(bool available)
   if (notice)
   {
     if (type != LG_CLIPBOARD_DATA_FILES ||
-        lgClipboardFiles_remoteReady(fileDataset))
+        clipboardFiles_remoteReady(fileDataset))
       g_state.ds->cbNotice(type);
   }
   if (!available)
@@ -1475,7 +1475,7 @@ void lgClipboard_setLocalAvailable(bool available)
   LG_UNLOCK(clipboard.callbackLock);
 }
 
-void lgClipboard_setFallback(const LG_ClipboardOps * ops, void * opaque)
+void clipboard_setFallback(const LG_ClipboardOps * ops, void * opaque)
 {
   setBinding(&clipboard.fallback,
       ops, opaque, fallbackStatusChanged);
@@ -1494,23 +1494,23 @@ static void dropBinding(ClipboardBinding * target)
   LG_UNLOCK(clipboard.registrationLock);
 }
 
-void lgClipboard_dropFallback(void)
+void clipboard_dropFallback(void)
 {
   dropBinding(&clipboard.fallback);
 }
 
-void lgClipboard_setTransport(const LG_ClipboardOps * ops, void * opaque)
+void clipboard_setTransport(const LG_ClipboardOps * ops, void * opaque)
 {
   setBinding(&clipboard.transport,
       ops, opaque, transportStatusChanged);
 }
 
-void lgClipboard_dropTransport(void)
+void clipboard_dropTransport(void)
 {
   dropBinding(&clipboard.transport);
 }
 
-void lgClipboard_release(void)
+void clipboard_release(void)
 {
   if (!g_params.clipboardToVM)
     return;
@@ -1530,14 +1530,14 @@ void lgClipboard_release(void)
   LG_UNLOCK(clipboard.writeLock);
 }
 
-void lgClipboard_notifyTypes(
+void clipboard_notifyTypes(
     const LG_ClipboardData types[], size_t count)
 {
   if (!g_params.clipboardToVM)
     return;
   if (count == 0)
   {
-    lgClipboard_release();
+    clipboard_release();
     return;
   }
   if (!types || count > LG_CLIPBOARD_DATA_NONE)
@@ -1564,7 +1564,7 @@ void lgClipboard_notifyTypes(
   LG_UNLOCK(clipboard.writeLock);
 }
 
-void lgClipboard_notifyFiles(uint64_t dataset)
+void clipboard_notifyFiles(uint64_t dataset)
 {
   if (!g_params.clipboardToVM || !dataset)
     return;
@@ -1827,7 +1827,7 @@ static LG_ClipboardResult pumpRemoteCompat(void)
   }
 }
 
-LG_ClipboardResult lgClipboard_dataBegin(LG_ClipboardRequest transfer,
+LG_ClipboardResult clipboard_dataBegin(LG_ClipboardRequest transfer,
     LG_ClipboardData type, uint64_t sizeHint)
 {
   if (!g_params.clipboardToVM ||
@@ -1846,7 +1846,7 @@ LG_ClipboardResult lgClipboard_dataBegin(LG_ClipboardRequest transfer,
   return result;
 }
 
-LG_ClipboardResult lgClipboard_dataChunk(LG_ClipboardRequest transfer,
+LG_ClipboardResult clipboard_dataChunk(LG_ClipboardRequest transfer,
     uint64_t offset, const void * data, size_t size)
 {
   if (!g_params.clipboardToVM ||
@@ -1865,7 +1865,7 @@ LG_ClipboardResult lgClipboard_dataChunk(LG_ClipboardRequest transfer,
   return result;
 }
 
-LG_ClipboardResult lgClipboard_dataEnd(LG_ClipboardRequest transfer,
+LG_ClipboardResult clipboard_dataEnd(LG_ClipboardRequest transfer,
     uint64_t finalSize)
 {
   if (!g_params.clipboardToVM ||
@@ -1884,7 +1884,7 @@ LG_ClipboardResult lgClipboard_dataEnd(LG_ClipboardRequest transfer,
   return result;
 }
 
-void lgClipboard_data(LG_ClipboardRequest transfer,
+void clipboard_data(LG_ClipboardRequest transfer,
     LG_ClipboardData type, const void * data, size_t size)
 {
   if (!g_params.clipboardToVM ||
@@ -1953,7 +1953,7 @@ void lgClipboard_data(LG_ClipboardRequest transfer,
     DEBUG_WARN("Failed to send remote clipboard data");
 }
 
-void lgClipboard_abort(LG_ClipboardRequest transfer)
+void clipboard_abort(LG_ClipboardRequest transfer)
 {
   if (!g_params.clipboardToVM ||
       transfer == LG_CLIPBOARD_REQUEST_INVALID)
@@ -2049,7 +2049,7 @@ static bool requestClipboard(LG_ClipboardData type,
   return false;
 }
 
-bool lgClipboard_requestStream(LG_ClipboardData type,
+bool clipboard_requestStream(LG_ClipboardData type,
     const LG_ClipboardStreamOps * stream, void * opaque,
     LG_ClipboardRequest * request)
 {
@@ -2058,7 +2058,7 @@ bool lgClipboard_requestStream(LG_ClipboardData type,
   return requestClipboard(type, NULL, stream, opaque, request);
 }
 
-bool lgClipboard_requestReady(LG_ClipboardRequest id)
+bool clipboard_requestReady(LG_ClipboardRequest id)
 {
   if (id == LG_CLIPBOARD_REQUEST_INVALID || !clipboard.requests)
     return false;
@@ -2116,7 +2116,7 @@ bool lgClipboard_requestReady(LG_ClipboardRequest id)
   return result;
 }
 
-bool lgClipboard_request(LG_ClipboardData type,
+bool clipboard_request(LG_ClipboardData type,
     LG_ClipboardReplyFn replyFn, void * opaque)
 {
   if (!replyFn)
@@ -2124,7 +2124,7 @@ bool lgClipboard_request(LG_ClipboardData type,
   return requestClipboard(type, replyFn, NULL, opaque, NULL);
 }
 
-bool lgClipboard_fileAcquire(uint64_t dataset, uint64_t acquisition)
+bool clipboard_fileAcquire(uint64_t dataset, uint64_t acquisition)
 {
   bool result = false;
   LG_LOCK_SHARED(clipboard.activeLock);
@@ -2135,7 +2135,7 @@ bool lgClipboard_fileAcquire(uint64_t dataset, uint64_t acquisition)
   return result;
 }
 
-bool lgClipboard_fileAcquired(uint64_t dataset, uint64_t acquisition,
+bool clipboard_fileAcquired(uint64_t dataset, uint64_t acquisition,
     LG_ClipboardFileError error)
 {
   bool result = false;
@@ -2147,7 +2147,7 @@ bool lgClipboard_fileAcquired(uint64_t dataset, uint64_t acquisition,
   return result;
 }
 
-bool lgClipboard_fileRelease(uint64_t dataset, uint64_t acquisition)
+bool clipboard_fileRelease(uint64_t dataset, uint64_t acquisition)
 {
   bool result = false;
   LG_LOCK_SHARED(clipboard.activeLock);
@@ -2158,7 +2158,7 @@ bool lgClipboard_fileRelease(uint64_t dataset, uint64_t acquisition)
   return result;
 }
 
-bool lgClipboard_fileRequest(const LG_ClipboardFileRequest * request)
+bool clipboard_fileRequest(const LG_ClipboardFileRequest * request)
 {
   bool result = false;
   LG_LOCK_SHARED(clipboard.activeLock);
@@ -2169,7 +2169,7 @@ bool lgClipboard_fileRequest(const LG_ClipboardFileRequest * request)
   return result;
 }
 
-LG_ClipboardResult lgClipboard_fileDataBegin(
+LG_ClipboardResult clipboard_fileDataBegin(
     const LG_ClipboardFileRequest * request, uint64_t sizeHint)
 {
   LG_ClipboardResult result = LG_CLIPBOARD_RESULT_FAILED;
@@ -2181,7 +2181,7 @@ LG_ClipboardResult lgClipboard_fileDataBegin(
   return result;
 }
 
-LG_ClipboardResult lgClipboard_fileDataChunk(
+LG_ClipboardResult clipboard_fileDataChunk(
     const LG_ClipboardFileRequest * request, uint64_t responseOffset,
     const void * data, size_t size, bool end)
 {
@@ -2194,7 +2194,7 @@ LG_ClipboardResult lgClipboard_fileDataChunk(
   return result;
 }
 
-LG_ClipboardResult lgClipboard_fileDataEnd(
+LG_ClipboardResult clipboard_fileDataEnd(
     const LG_ClipboardFileRequest * request, uint64_t finalSize)
 {
   LG_ClipboardResult result = LG_CLIPBOARD_RESULT_FAILED;
@@ -2206,7 +2206,7 @@ LG_ClipboardResult lgClipboard_fileDataEnd(
   return result;
 }
 
-bool lgClipboard_fileCancel(uint64_t dataset, uint64_t request,
+bool clipboard_fileCancel(uint64_t dataset, uint64_t request,
     LG_ClipboardFileError reason)
 {
   bool result = false;
@@ -2218,7 +2218,7 @@ bool lgClipboard_fileCancel(uint64_t dataset, uint64_t request,
   return result;
 }
 
-void lgClipboard_fileRemoteReady(uint64_t dataset)
+void clipboard_fileRemoteReady(uint64_t dataset)
 {
   LG_LOCK(clipboard.callbackLock);
   LG_LOCK(clipboard.stateLock);
@@ -2232,7 +2232,7 @@ void lgClipboard_fileRemoteReady(uint64_t dataset)
   LG_UNLOCK(clipboard.callbackLock);
 }
 
-void lgClipboard_fileRemoteFailed(uint64_t dataset)
+void clipboard_fileRemoteFailed(uint64_t dataset)
 {
   if (!dataset)
     return;

client/src/clipboard_files.c

@@ -503,13 +503,13 @@ static void performRemoteAction(struct RemoteAction action)
   switch (action.type)
   {
     case REMOTE_ACTION_CANCEL_ACQUISITION:
-      if (!lgClipboard_fileCancel(action.dataset, action.acquisition,
+      if (!clipboard_fileCancel(action.dataset, action.acquisition,
             LG_CLIPBOARD_FILE_ERROR_CANCELLED))
         DEBUG_WARN("Failed to cancel retired clipboard file acquisition");
       break;
 
     case REMOTE_ACTION_RELEASE_ACQUISITION:
-      if (!lgClipboard_fileRelease(action.dataset, action.acquisition))
+      if (!clipboard_fileRelease(action.dataset, action.acquisition))
         DEBUG_WARN("Failed to release retired clipboard file acquisition");
       break;
 
@@ -754,7 +754,7 @@ static void failRemoteRequest(struct RemoteRequest * request, int error)
     return;
   if (request->reply == REMOTE_REPLY_INITIAL)
     DEBUG_WARN("Remote clipboard file root list failed: "
-        "dataset=%" PRIu64 ", request=%" PRIu64 ", error=%d (%s)",
+        "dataset=%lu, request=%lu, error=%d (%s)",
         request->request.dataset, request->request.request,
         error, strerror(error));
   unregisterRemoteInterrupt(request);
@@ -768,7 +768,7 @@ static void failRemoteRequest(struct RemoteRequest * request, int error)
   freeRemoteRequest(request);
   performRemoteAction(action);
   if (failedDataset)
-    lgClipboard_fileRemoteFailed(failedDataset);
+    clipboard_fileRemoteFailed(failedDataset);
 }
 
 static void completeRemoteRequest(struct RemoteRequest * request)
@@ -1014,9 +1014,9 @@ static void finishRemoteRequest(struct RemoteRequest * request)
       if (current)
       {
         DEBUG_INFO("Remote clipboard file root list ready; publishing: "
-            "dataset=%" PRIu64 ", request=%" PRIu64,
+            "dataset=%lu, request=%lu",
             datasetId, requestId);
-        lgClipboard_fileRemoteReady(datasetId);
+        clipboard_fileRemoteReady(datasetId);
       }
       completeRemoteRequest(request);
       return;
@@ -1067,7 +1067,7 @@ static void interruptRemoteRequest(fuse_req_t fuseRequest, void * opaque)
 
   const LG_ClipboardFileRequest descriptor = request->request;
   if (request->transportStarted &&
-      !lgClipboard_fileCancel(descriptor.dataset, descriptor.request,
+      !clipboard_fileCancel(descriptor.dataset, descriptor.request,
         LG_CLIPBOARD_FILE_ERROR_CANCELLED))
     DEBUG_WARN("Failed to cancel interrupted clipboard file request");
   fuse_reply_err(fuseRequest, EINTR);
@@ -1142,7 +1142,7 @@ static bool requestRemote(struct RemoteDataset * dataset,
   struct RemoteRequest * live = files.remoteRequests;
   while (live && live != request)
     live = live->next;
-  const bool sent = live && lgClipboard_fileRequest(&descriptor);
+  const bool sent = live && clipboard_fileRequest(&descriptor);
   if (sent)
     request->transportStarted = true;
   LG_UNLOCK(files.lock);
@@ -2019,7 +2019,7 @@ static struct LocalNode * addLocalNode(struct LocalDataset * dataset,
   return node;
 }
 
-bool lgClipboardFiles_setLocal(const char * mime,
+bool clipboardFiles_setLocal(const char * mime,
     const void * data, size_t size)
 {
   if (!mime || (!data && size) ||
@@ -2099,7 +2099,7 @@ bool lgClipboardFiles_setLocal(const char * mime,
   const uint64_t datasetId = dataset->dataset;
   LG_UNLOCK(files.lock);
   freeLocalDataset(retired);
-  lgClipboard_notifyFiles(datasetId);
+  clipboard_notifyFiles(datasetId);
   return true;
 
 invalid:
@@ -2107,7 +2107,7 @@ invalid:
   return false;
 }
 
-void lgClipboardFiles_clearLocal(void)
+void clipboardFiles_clearLocal(void)
 {
   LG_LOCK(files.lock);
   struct LocalDataset * retired = NULL;
@@ -2206,7 +2206,7 @@ error:
   return false;
 }
 
-bool lgClipboardFiles_getRemote(const char * mime,
+bool clipboardFiles_getRemote(const char * mime,
     char ** data, size_t * size)
 {
   if (!mime || !data || !size)
@@ -2221,7 +2221,7 @@ bool lgClipboardFiles_getRemote(const char * mime,
   return result;
 }
 
-uint64_t lgClipboardFiles_remotePresentationAcquire(void)
+uint64_t clipboardFiles_remotePresentationAcquire(void)
 {
   LG_LOCK(files.lock);
   struct RemoteDataset * dataset = files.remoteCurrent;
@@ -2233,7 +2233,7 @@ uint64_t lgClipboardFiles_remotePresentationAcquire(void)
   return presentation;
 }
 
-bool lgClipboardFiles_getRemotePresentation(uint64_t presentation,
+bool clipboardFiles_getRemotePresentation(uint64_t presentation,
     const char * mime, char ** data, size_t * size)
 {
   if (!presentation || !mime || !data || !size)
@@ -2249,7 +2249,7 @@ bool lgClipboardFiles_getRemotePresentation(uint64_t presentation,
   return result;
 }
 
-void lgClipboardFiles_remotePresentationDelivered(uint64_t presentation)
+void clipboardFiles_remotePresentationDelivered(uint64_t presentation)
 {
   if (!presentation)
     return;
@@ -2276,7 +2276,7 @@ void lgClipboardFiles_remotePresentationDelivered(uint64_t presentation)
     reapRemoteDeliveries(true);
 }
 
-void lgClipboardFiles_remotePresentationRelease(uint64_t presentation)
+void clipboardFiles_remotePresentationRelease(uint64_t presentation)
 {
   if (!presentation)
     return;
@@ -2289,7 +2289,7 @@ void lgClipboardFiles_remotePresentationRelease(uint64_t presentation)
   performRemoteAction(action);
 }
 
-bool lgClipboardFiles_remoteReady(uint64_t dataset)
+bool clipboardFiles_remoteReady(uint64_t dataset)
 {
   LG_LOCK(files.lock);
   struct RemoteDataset * found = remoteDatasetByIdNL(dataset);
@@ -2314,16 +2314,16 @@ static void cancelRetiredInitialRequest(struct RemoteRequest * request)
     return;
   const LG_ClipboardFileRequest descriptor = request->request;
   if (request->transportStarted &&
-      !lgClipboard_fileCancel(descriptor.dataset, descriptor.request,
+      !clipboard_fileCancel(descriptor.dataset, descriptor.request,
         LG_CLIPBOARD_FILE_ERROR_CANCELLED))
     DEBUG_WARN("Failed to cancel retired clipboard file request");
   unregisterRemoteInterrupt(request);
   completeRemoteRequest(request);
 }
 
-bool lgClipboardFiles_remoteOffer(uint64_t datasetId)
+bool clipboardFiles_remoteOffer(uint64_t datasetId)
 {
-  DEBUG_INFO("Remote clipboard file offer received: dataset=%" PRIu64,
+  DEBUG_INFO("dataset=%lu",
       datasetId);
   if (!datasetId)
     return false;
@@ -2405,16 +2405,16 @@ bool lgClipboardFiles_remoteOffer(uint64_t datasetId)
   cancelRetiredInitialRequest(cancelled);
   performRemoteAction(previousAction);
   reapRemoteDeliveries(true);
-  if (!lgClipboard_fileAcquire(datasetId, acquisition))
+  if (!clipboard_fileAcquire(datasetId, acquisition))
   {
-    lgClipboardFiles_remoteCancel(datasetId, acquisition,
+    clipboardFiles_remoteCancel(datasetId, acquisition,
         LG_CLIPBOARD_FILE_ERROR_DISCONNECTED);
     return false;
   }
   return true;
 }
 
-void lgClipboardFiles_remoteClear(void)
+void clipboardFiles_remoteClear(void)
 {
   LG_LOCK(files.lock);
   struct RemoteDataset * previous = files.remoteCurrent;
@@ -2432,7 +2432,7 @@ void lgClipboardFiles_remoteClear(void)
   performRemoteAction(action);
 }
 
-void lgClipboardFiles_providerUnavailable(void)
+void clipboardFiles_providerUnavailable(void)
 {
   if (!files.initialized)
     return;
@@ -2509,7 +2509,7 @@ void lgClipboardFiles_providerUnavailable(void)
   }
 }
 
-void lgClipboardFiles_remoteAcquired(uint64_t datasetId,
+void clipboardFiles_remoteAcquired(uint64_t datasetId,
     uint64_t acquisition, LG_ClipboardFileError error)
 {
   LG_LOCK(files.lock);
@@ -2530,16 +2530,13 @@ void lgClipboardFiles_remoteAcquired(uint64_t datasetId,
     retireRemoteDatasetNL(dataset) : (struct RemoteAction) { 0 };
   LG_UNLOCK(files.lock);
   if (valid && error)
-    DEBUG_WARN("Remote clipboard file acquisition failed: "
-        "dataset=%" PRIu64 ", acquisition=%" PRIu64 ", error=%u (%s)",
+    DEBUG_WARN("failed: dataset=%lu, acquisition=%lu, error=%u (%s)",
         datasetId, acquisition, (unsigned)error, fileErrorName(error));
   else if (valid)
-    DEBUG_INFO("Remote clipboard file acquisition succeeded: "
-        "dataset=%" PRIu64 ", acquisition=%" PRIu64,
-        datasetId, acquisition);
+    DEBUG_INFO("dataset=%lu, acquisition=%lu", datasetId, acquisition);
   performRemoteAction(action);
   if (failedDataset)
-    lgClipboard_fileRemoteFailed(failedDataset);
+    clipboard_fileRemoteFailed(failedDataset);
   if (!pinned)
     return;
   if (!requestRemote(dataset, root, LG_CLIPBOARD_FILE_LIST,
@@ -2552,7 +2549,7 @@ void lgClipboardFiles_remoteAcquired(uint64_t datasetId,
     LG_UNLOCK(files.lock);
     performRemoteAction(failed);
     if (unsentDataset)
-      lgClipboard_fileRemoteFailed(unsentDataset);
+      clipboard_fileRemoteFailed(unsentDataset);
   }
   releaseRemoteOperation(dataset);
 }
@@ -2569,7 +2566,7 @@ static bool sameRemoteFileRequest(
     request->request.operation == descriptor->operation;
 }
 
-LG_ClipboardResult lgClipboardFiles_remoteDataBegin(
+LG_ClipboardResult clipboardFiles_remoteDataBegin(
     const LG_ClipboardFileRequest * descriptor, uint64_t sizeHint)
 {
   if (!descriptor)
@@ -2595,7 +2592,7 @@ LG_ClipboardResult lgClipboardFiles_remoteDataBegin(
     LG_CLIPBOARD_RESULT_FAILED;
 }
 
-LG_ClipboardResult lgClipboardFiles_remoteDataChunk(
+LG_ClipboardResult clipboardFiles_remoteDataChunk(
     const LG_ClipboardFileRequest * descriptor, uint64_t responseOffset,
     const void * data, size_t size)
 {
@@ -2629,7 +2626,7 @@ LG_ClipboardResult lgClipboardFiles_remoteDataChunk(
     LG_CLIPBOARD_RESULT_FAILED;
 }
 
-LG_ClipboardResult lgClipboardFiles_remoteDataEnd(
+LG_ClipboardResult clipboardFiles_remoteDataEnd(
     const LG_ClipboardFileRequest * descriptor, uint64_t finalSize)
 {
   if (!descriptor)
@@ -2653,7 +2650,7 @@ LG_ClipboardResult lgClipboardFiles_remoteDataEnd(
   return LG_CLIPBOARD_RESULT_ACCEPTED;
 }
 
-void lgClipboardFiles_remoteCancel(uint64_t dataset,
+void clipboardFiles_remoteCancel(uint64_t dataset,
     uint64_t requestId, LG_ClipboardFileError reason)
 {
   LG_LOCK(files.lock);
@@ -2682,13 +2679,13 @@ void lgClipboardFiles_remoteCancel(uint64_t dataset,
   LG_UNLOCK(files.lock);
   if (acquisition)
     DEBUG_WARN("Remote clipboard file acquisition failed: "
-        "dataset=%" PRIu64 ", acquisition=%" PRIu64 ", error=%u (%s)",
+        "dataset=%lu, acquisition=%lu, error=%u (%s)",
         dataset, requestId, (unsigned)reason, fileErrorName(reason));
   if (acquisition && !request)
   {
     performRemoteAction(action);
     if (failedDataset)
-      lgClipboard_fileRemoteFailed(failedDataset);
+      clipboard_fileRemoteFailed(failedDataset);
     return;
   }
   if (!request || request->request.dataset != dataset)
@@ -2696,16 +2693,16 @@ void lgClipboardFiles_remoteCancel(uint64_t dataset,
     failRemoteRequest(request, EIO);
     performRemoteAction(action);
     if (failedDataset)
-      lgClipboard_fileRemoteFailed(failedDataset);
+      clipboard_fileRemoteFailed(failedDataset);
     return;
   }
   failRemoteRequest(request, errnoFromFileError(reason));
   performRemoteAction(action);
   if (failedDataset)
-    lgClipboard_fileRemoteFailed(failedDataset);
+    clipboard_fileRemoteFailed(failedDataset);
 }
 
-void lgClipboardFiles_localAcquire(uint64_t wireDataset,
+void clipboardFiles_localAcquire(uint64_t wireDataset,
     uint64_t acquisition)
 {
   LG_ClipboardFileError error = LG_CLIPBOARD_FILE_ERROR_STALE;
@@ -2729,10 +2726,10 @@ void lgClipboardFiles_localAcquire(uint64_t wireDataset,
   LG_UNLOCK(files.lock);
   if (error)
     free(item);
-  lgClipboard_fileAcquired(wireDataset, acquisition, error);
+  clipboard_fileAcquired(wireDataset, acquisition, error);
 }
 
-void lgClipboardFiles_localRelease(uint64_t wireDataset,
+void clipboardFiles_localRelease(uint64_t wireDataset,
     uint64_t acquisition)
 {
   LG_LOCK(files.lock);
@@ -2774,14 +2771,14 @@ static bool sendJobCall(struct LocalJob * job, int operation,
     switch (operation)
     {
       case 0:
-        result = lgClipboard_fileDataBegin(&job->request, offset);
+        result = clipboard_fileDataBegin(&job->request, offset);
         break;
       case 1:
-        result = lgClipboard_fileDataChunk(
+        result = clipboard_fileDataChunk(
             &job->request, offset, data, size, end);
         break;
       default:
-        result = lgClipboard_fileDataEnd(&job->request, offset);
+        result = clipboard_fileDataEnd(&job->request, offset);
         break;
     }
     if (result == LG_CLIPBOARD_RESULT_ACCEPTED)
@@ -3256,7 +3253,7 @@ static int localWorker(void * opaque)
         localList(job) : localRead(job);
     if (error && error != LG_CLIPBOARD_FILE_ERROR_CANCELLED &&
         !atomic_load_explicit(&job->cancelled, memory_order_acquire))
-      lgClipboard_fileCancel(job->request.dataset,
+      clipboard_fileCancel(job->request.dataset,
           job->request.request, error);
     LG_LOCK(files.lock);
     struct LocalJob ** link = &files.activeJobs;
@@ -3275,7 +3272,7 @@ static int localWorker(void * opaque)
   }
 }
 
-void lgClipboardFiles_localRequest(
+void clipboardFiles_localRequest(
     const LG_ClipboardFileRequest * request)
 {
   if (!request || !request->request ||
@@ -3289,14 +3286,14 @@ void lgClipboardFiles_localRequest(
         request->length > (uint64_t)INT64_MAX - request->offset)))
   {
     if (request)
-      lgClipboard_fileCancel(request->dataset, request->request,
+      clipboard_fileCancel(request->dataset, request->request,
           LG_CLIPBOARD_FILE_ERROR_INVALID);
     return;
   }
   struct LocalJob * job = calloc(1, sizeof(*job));
   if (!job)
   {
-    lgClipboard_fileCancel(request->dataset, request->request,
+    clipboard_fileCancel(request->dataset, request->request,
         LG_CLIPBOARD_FILE_ERROR_NO_MEMORY);
     return;
   }
@@ -3304,7 +3301,7 @@ void lgClipboardFiles_localRequest(
   if (!job->ready)
   {
     free(job);
-    lgClipboard_fileCancel(request->dataset, request->request,
+    clipboard_fileCancel(request->dataset, request->request,
         LG_CLIPBOARD_FILE_ERROR_NO_MEMORY);
     return;
   }
@@ -3327,11 +3324,11 @@ void lgClipboardFiles_localRequest(
   }
   lgFreeEvent(job->ready);
   free(job);
-  lgClipboard_fileCancel(request->dataset, request->request,
+  clipboard_fileCancel(request->dataset, request->request,
       LG_CLIPBOARD_FILE_ERROR_STALE);
 }
 
-void lgClipboardFiles_localCancel(uint64_t dataset,
+void clipboardFiles_localCancel(uint64_t dataset,
     uint64_t request, LG_ClipboardFileError reason)
 {
   (void)reason;
@@ -3363,7 +3360,7 @@ void lgClipboardFiles_localCancel(uint64_t dataset,
   freeLocalDataset(retired);
 }
 
-void lgClipboardFiles_localReady(uint64_t request)
+void clipboardFiles_localReady(uint64_t request)
 {
   LG_LOCK(files.lock);
   for (struct LocalJob * job = files.activeJobs; job; job = job->next)
@@ -3397,9 +3394,9 @@ static void freeState(void)
   {
     struct RemoteDataset * next = remote->next;
     if (remote->acquired)
-      lgClipboard_fileRelease(remote->dataset, remote->acquisition);
+      clipboard_fileRelease(remote->dataset, remote->acquisition);
     else if (remote->acquiring)
-      lgClipboard_fileCancel(remote->dataset, remote->acquisition,
+      clipboard_fileCancel(remote->dataset, remote->acquisition,
           LG_CLIPBOARD_FILE_ERROR_CANCELLED);
     free(remote);
     remote = next;
@@ -3420,7 +3417,7 @@ static void freeState(void)
   }
 }
 
-bool lgClipboardFiles_init(void)
+bool clipboardFiles_init(void)
 {
   if (filesLockInitialized)
     return false;
@@ -3512,12 +3509,12 @@ bool lgClipboardFiles_init(void)
   return true;
 
 failed:
-  lgClipboardFiles_free();
+  clipboardFiles_free();
   return false;
 }
 
 #ifdef ENABLE_TESTS
-bool lgClipboardFiles_testFuseStopWake(void)
+bool clipboardFiles_testFuseStopWake(void)
 {
   const int stopFd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK);
   if (stopFd < 0)
@@ -3528,12 +3525,12 @@ bool lgClipboardFiles_testFuseStopWake(void)
   return result;
 }
 
-bool lgClipboardFiles_testUnsentRemoteOwnership(void)
+bool clipboardFiles_testUnsentRemoteOwnership(void)
 {
   return finishUnsentRemoteRequest(0);
 }
 
-bool lgClipboardFiles_testInit(uint64_t nonce)
+bool clipboardFiles_testInit(uint64_t nonce)
 {
   if (filesLockInitialized)
     return false;
@@ -3556,7 +3553,7 @@ bool lgClipboardFiles_testInit(uint64_t nonce)
   return true;
 }
 
-size_t lgClipboardFiles_testRemoteDatasetCount(void)
+size_t clipboardFiles_testRemoteDatasetCount(void)
 {
   if (!filesLockInitialized)
     return 0;
@@ -3569,7 +3566,7 @@ size_t lgClipboardFiles_testRemoteDatasetCount(void)
   return count;
 }
 
-void lgClipboardFiles_testExpireRemoteDeliveries(void)
+void clipboardFiles_testExpireRemoteDeliveries(void)
 {
   if (!filesLockInitialized)
     return;
@@ -3582,7 +3579,7 @@ void lgClipboardFiles_testExpireRemoteDeliveries(void)
   reapRemoteDeliveries(false);
 }
 
-bool lgClipboardFiles_testBeginRemoteLookup(uint64_t presentation)
+bool clipboardFiles_testBeginRemoteLookup(uint64_t presentation)
 {
   LG_LOCK(files.lock);
   struct RemoteDataset * dataset =
@@ -3593,7 +3590,7 @@ bool lgClipboardFiles_testBeginRemoteLookup(uint64_t presentation)
   return result;
 }
 
-void lgClipboardFiles_testEndRemoteLookup(uint64_t presentation)
+void clipboardFiles_testEndRemoteLookup(uint64_t presentation)
 {
   LG_LOCK(files.lock);
   struct RemoteDataset * dataset =
@@ -3605,7 +3602,7 @@ void lgClipboardFiles_testEndRemoteLookup(uint64_t presentation)
   performRemoteAction(action);
 }
 
-bool lgClipboardFiles_testRemoteRead(uint64_t presentation,
+bool clipboardFiles_testRemoteRead(uint64_t presentation,
     uint64_t nodeId, uint64_t offset, uint32_t length)
 {
   LG_LOCK(files.lock);
@@ -3625,12 +3622,12 @@ bool lgClipboardFiles_testRemoteRead(uint64_t presentation,
   return result;
 }
 
-void lgClipboardFiles_testForceLocalEof(void)
+void clipboardFiles_testForceLocalEof(void)
 {
   atomic_store_explicit(&forceLocalEof, true, memory_order_release);
 }
 
-bool lgClipboardFiles_testLocalRequest(
+bool clipboardFiles_testLocalRequest(
     const LG_ClipboardFileRequest * request)
 {
   if (!request ||
@@ -3652,7 +3649,7 @@ bool lgClipboardFiles_testLocalRequest(
     request->operation == LG_CLIPBOARD_FILE_LIST ?
     localList(&job) : localRead(&job);
   if (error && error != LG_CLIPBOARD_FILE_ERROR_CANCELLED)
-    lgClipboard_fileCancel(request->dataset, request->request, error);
+    clipboard_fileCancel(request->dataset, request->request, error);
   LG_LOCK(files.lock);
   if (job.dataset->references)
     --job.dataset->references;
@@ -3661,7 +3658,7 @@ bool lgClipboardFiles_testLocalRequest(
 }
 #endif
 
-void lgClipboardFiles_free(void)
+void clipboardFiles_free(void)
 {
   if (!filesLockInitialized)
     return;

client/src/main.c

@@ -723,7 +723,7 @@ static void preSwapCallback(void * udata)
   if (!written)
     DEBUG_ERROR("Failed to write test capture to: %s", l_testCapture.path);
   else
-    DEBUG_INFO("Wrote test capture for frame %" PRIu64 " to: %s",
+    DEBUG_INFO("Wrote test capture for frame %lu to: %s",
         serial, l_testCapture.path);
   app_setState(APP_STATE_SHUTDOWN);
 #endif
@@ -1142,13 +1142,13 @@ static int renderThread(void * unused)
   {
     lgInput_setTransport(NULL, NULL);
     lgAudio_setTransport(NULL, NULL);
-    lgClipboard_setTransport(NULL, NULL);
+    clipboard_setTransport(NULL, NULL);
   }
   else
   {
     lgInput_dropTransport();
     lgAudio_dropTransport();
-    lgClipboard_dropTransport();
+    clipboard_dropTransport();
   }
 
   core_stopVideoThreads();
@@ -1206,7 +1206,7 @@ int main_cursorThread(void * unused)
       {
         lgInput_dropTransport();
         lgAudio_dropTransport();
-        lgClipboard_dropTransport();
+        clipboard_dropTransport();
         primaryLost();
       }
       else
@@ -1410,7 +1410,7 @@ int main_frameThread(void * unused)
       {
         lgInput_dropTransport();
         lgAudio_dropTransport();
-        lgClipboard_dropTransport();
+        clipboard_dropTransport();
         primaryLost();
       }
       else if (status == LG_TRANSPORT_END)
@@ -3322,7 +3322,7 @@ static int lg_run(void)
   frameTimingInit();
   lgInput_init();
   lgAudio_init();
-  if (!lgClipboard_init())
+  if (!clipboard_init())
     return -1;
 
 #ifdef ENABLE_TESTS
@@ -3654,7 +3654,7 @@ static int lg_run(void)
   g_state.ds->startup();
   const bool clipboardAvailable =
     g_state.ds->cbInit && g_state.ds->cbInit();
-  lgClipboard_setLocalAvailable(clipboardAvailable);
+  clipboard_setLocalAvailable(clipboardAvailable);
 
   if (g_params.captureOnStart)
     core_setGrab(true);
@@ -3876,7 +3876,7 @@ restart:
     g_state.transport.ops->getClipboardOps ?
       g_state.transport.ops->getClipboardOps(
           g_state.transport.handle, &clipboardOpaque) : NULL;
-  lgClipboard_setTransport(clipboardOps, clipboardOpaque);
+  clipboard_setTransport(clipboardOps, clipboardOpaque);
 
   DEBUG_INFO("Starting session");
   atomic_store_explicit(
@@ -3912,7 +3912,7 @@ restart:
     {
       lgInput_dropTransport();
       lgAudio_dropTransport();
-      lgClipboard_dropTransport();
+      clipboard_dropTransport();
       primaryLost();
       break;
     }
@@ -3942,7 +3942,7 @@ restart:
     videoSourceClearCursor(LG_VIDEO_SOURCE_PRIMARY);
     lgInput_dropTransport();
     lgAudio_dropTransport();
-    lgClipboard_dropTransport();
+    clipboard_dropTransport();
     g_state.transport.ops->disconnect(g_state.transport.handle);
 
     if (app_transitionState(APP_STATE_RESTART, APP_STATE_RUNNING))
@@ -3999,19 +3999,19 @@ static void lg_shutdown(void)
         g_state.transport.ops->sessionValid(g_state.transport.handle))
     {
       lgAudio_setTransport(NULL, NULL);
-      lgClipboard_setTransport(NULL, NULL);
+      clipboard_setTransport(NULL, NULL);
     }
     else
     {
       lgAudio_dropTransport();
-      lgClipboard_dropTransport();
+      clipboard_dropTransport();
     }
     lgTransport_destroy(&g_state.transport);
   }
 
   lgInput_free();
   lgAudio_free();
-  lgClipboard_setLocalAvailable(false);
+  clipboard_setLocalAvailable(false);
 
   if (e_startup)
   {
@@ -4030,7 +4030,7 @@ static void lg_shutdown(void)
 
   /* Clipboard sources own FUSE dataset references and are released by the
    * display server before the filesystem is unmounted. */
-  lgClipboard_free();
+  clipboard_free();
 
   // Input callbacks have stopped; the evdev state and overlays can go
   evdev_free();

client/src/transport_fallback.c

@@ -229,13 +229,13 @@ static void unpublishProviders(LG_TransportFallback * fallback, bool live)
   {
     lgInput_setFallback(NULL, NULL);
     lgAudio_setFallback(NULL, NULL);
-    lgClipboard_setFallback(NULL, NULL);
+    clipboard_setFallback(NULL, NULL);
   }
   else
   {
     lgInput_dropFallback();
     lgAudio_dropFallback();
-    lgClipboard_dropFallback();
+    clipboard_dropFallback();
   }
   fallback->providersPublished = false;
   LG_UNLOCK(fallback->providerLock);
@@ -322,7 +322,7 @@ static bool publishProviders(LG_TransportFallback * fallback)
     fallback->transport.ops->getClipboardOps ?
       fallback->transport.ops->getClipboardOps(
           fallback->transport.handle, &clipboardOpaque) : NULL;
-  lgClipboard_setFallback(clipboardOps, clipboardOpaque);
+  clipboard_setFallback(clipboardOps, clipboardOpaque);
   fallback->providersPublished = true;
   LG_UNLOCK_SHARED(fallback->lock);
   LG_UNLOCK(fallback->providerLock);

client/src/usb_audio.c

@@ -1817,8 +1817,8 @@ static void reportPlaybackDebug(LG_USBAudio * audio)
       !audio->playbackInvalidPackets)
     return;
 
-  DEBUG_INFO("USB playback: concealed %" PRIu64
-      " packets, invalid %" PRIu64,
+  DEBUG_INFO("USB playback: concealed %lu"
+      " packets, invalid %lu",
       audio->playbackConcealedPackets,
       audio->playbackInvalidPackets);
   audio->playbackConcealedPackets = 0;